@switchbot/homebridge-switchbot 4.1.1-beta.2 → 4.1.1-beta.3

package/dist/device/colorbulb.js

@@ -144,7 +144,7 @@ export class ColorBulb extends deviceBase {
             }
             catch (e) {
                 await this.apiError(e);
-                await this.errorLog(`failed pushChanges with ${device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`failed pushChanges with ${device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
             this.colorBulbUpdateInProgress = false;
         });
@@ -153,59 +153,59 @@ export class ColorBulb extends deviceBase {
      * Parse the device status from the SwitchBotBLE API
      */
     async BLEparseStatus() {
-        await this.debugLog('BLEparseStatus');
+        this.debugLog('BLEparseStatus');
         // On
         this.LightBulb.On = this.serviceData.power;
-        await this.debugLog(`On: ${this.LightBulb.On}`);
+        this.debugLog(`On: ${this.LightBulb.On}`);
         // Brightness
         this.LightBulb.Brightness = this.serviceData.brightness;
-        await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
+        this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
         // Color, Hue & Brightness
-        await this.debugLog(`red: ${this.serviceData.red}, green: ${this.serviceData.green}, blue: ${this.serviceData.blue}`);
+        this.debugLog(`red: ${this.serviceData.red}, green: ${this.serviceData.green}, blue: ${this.serviceData.blue}`);
         const [hue, saturation] = rgb2hs(this.serviceData.red, this.serviceData.green, this.serviceData.blue);
-        await this.debugLog(`hs: ${JSON.stringify(rgb2hs(this.serviceData.red, this.serviceData.green, this.serviceData.blue))}`);
+        this.debugLog(`hs: ${JSON.stringify(rgb2hs(this.serviceData.red, this.serviceData.green, this.serviceData.blue))}`);
         // Hue
         this.LightBulb.Hue = hue;
-        await this.debugLog(`Hue: ${this.LightBulb.Hue}`);
+        this.debugLog(`Hue: ${this.LightBulb.Hue}`);
         // Saturation
         this.LightBulb.Saturation = saturation;
-        await this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
+        this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
         // ColorTemperature
         const miredColorTemperature = Math.round(1000000 / this.serviceData.color_temperature);
         this.LightBulb.ColorTemperature = Math.max(Math.min(miredColorTemperature, 500), 140);
-        await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+        this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
     }
     /**
      * Parse the device status from the SwitchBot OpenAPI
      */
     async openAPIparseStatus() {
-        await this.debugLog('openAPIparseStatus');
+        this.debugLog('openAPIparseStatus');
         // On
         this.LightBulb.On = this.deviceStatus.power === 'on';
-        await this.debugLog(`On: ${this.LightBulb.On}`);
+        this.debugLog(`On: ${this.LightBulb.On}`);
         // Brightness
         this.LightBulb.Brightness = this.deviceStatus.brightness;
-        await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
+        this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
         // Color, Hue & Brightness
-        await this.debugLog(`color: ${JSON.stringify(this.deviceStatus.color)}`);
+        this.debugLog(`color: ${JSON.stringify(this.deviceStatus.color)}`);
         const [red, green, blue] = this.deviceStatus.color.split(':');
-        await this.debugLog(`red: ${JSON.stringify(red)}, green: ${JSON.stringify(green)}, blue: ${JSON.stringify(blue)}`);
+        this.debugLog(`red: ${JSON.stringify(red)}, green: ${JSON.stringify(green)}, blue: ${JSON.stringify(blue)}`);
         const [hue, saturation] = rgb2hs(red, green, blue);
-        await this.debugLog(`hs: ${JSON.stringify(rgb2hs(red, green, blue))}`);
+        this.debugLog(`hs: ${JSON.stringify(rgb2hs(red, green, blue))}`);
         // Hue
         this.LightBulb.Hue = hue;
-        await this.debugLog(`Hue: ${this.LightBulb.Hue}`);
+        this.debugLog(`Hue: ${this.LightBulb.Hue}`);
         // Saturation
         this.LightBulb.Saturation = saturation;
-        await this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
+        this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
         // ColorTemperature
         const miredColorTemperature = Math.round(1000000 / this.deviceStatus.colorTemperature);
         this.LightBulb.ColorTemperature = Math.max(Math.min(miredColorTemperature, 500), 140);
-        await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+        this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
         // Firmware Version
         if (this.deviceStatus.version) {
             const version = this.deviceStatus.version.toString();
-            await this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
+            this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
             const deviceVersion = version.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
@@ -214,41 +214,41 @@ export class ColorBulb extends deviceBase {
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
                 .updateValue(deviceVersion);
             this.accessory.context.version = deviceVersion;
-            await this.debugSuccessLog(`version: ${this.accessory.context.version}`);
+            this.debugSuccessLog(`version: ${this.accessory.context.version}`);
         }
     }
     async parseStatusWebhook() {
-        await this.debugLog('parseStatusWebhook');
-        await this.debugLog(`(powerState, brightness, color, colorTemperature) = Webhook:(${this.webhookContext.powerState}, ${this.webhookContext.brightness}, ${this.webhookContext.color}, ${this.webhookContext.colorTemperature}), current:(${this.LightBulb.On}, ${this.LightBulb.Brightness}, ${this.LightBulb.Hue}, ${this.LightBulb.Saturation}, ${this.LightBulb.ColorTemperature})`);
+        this.debugLog('parseStatusWebhook');
+        this.debugLog(`(powerState, brightness, color, colorTemperature) = Webhook:(${this.webhookContext.powerState}, ${this.webhookContext.brightness}, ${this.webhookContext.color}, ${this.webhookContext.colorTemperature}), current:(${this.LightBulb.On}, ${this.LightBulb.Brightness}, ${this.LightBulb.Hue}, ${this.LightBulb.Saturation}, ${this.LightBulb.ColorTemperature})`);
         // On
         this.LightBulb.On = this.webhookContext.powerState === 'ON';
-        await this.debugLog(`On: ${this.LightBulb.On}`);
+        this.debugLog(`On: ${this.LightBulb.On}`);
         // Brightness
         this.LightBulb.Brightness = this.webhookContext.brightness;
-        await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
+        this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
         // Color, Hue & Brightness
-        await this.debugLog(`color: ${JSON.stringify(this.webhookContext.color)}`);
+        this.debugLog(`color: ${JSON.stringify(this.webhookContext.color)}`);
         const [red, green, blue] = this.webhookContext.color.split(':');
-        await this.debugLog(`red: ${JSON.stringify(red)}, green: ${JSON.stringify(green)}, blue: ${JSON.stringify(blue)}`);
+        this.debugLog(`red: ${JSON.stringify(red)}, green: ${JSON.stringify(green)}, blue: ${JSON.stringify(blue)}`);
         const [hue, saturation] = rgb2hs(red, green, blue);
-        await this.debugLog(`hs: ${JSON.stringify(rgb2hs(red, green, blue))}`);
+        this.debugLog(`hs: ${JSON.stringify(rgb2hs(red, green, blue))}`);
         // Hue
         this.LightBulb.Hue = hue;
-        await this.debugLog(`Hue: ${this.LightBulb.Hue}`);
+        this.debugLog(`Hue: ${this.LightBulb.Hue}`);
         // Saturation
         this.LightBulb.Saturation = saturation;
-        await this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
+        this.debugLog(`Saturation: ${this.LightBulb.Saturation}`);
         // ColorTemperature
         const miredColorTemperature = Math.round(1000000 / this.webhookContext.colorTemperature);
         this.LightBulb.ColorTemperature = Math.max(Math.min(miredColorTemperature, 500), 140);
-        await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+        this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
     }
     /**
      * Asks the SwitchBot API for the latest device information
      */
     async refreshStatus() {
         if (!this.device.enableCloudService && this.OpenAPI) {
-            await this.errorLog(`refreshStatus enableCloudService: ${this.device.enableCloudService}`);
+            this.errorLog(`refreshStatus enableCloudService: ${this.device.enableCloudService}`);
         }
         else if (this.BLE) {
             await this.BLERefreshStatus();
@@ -258,11 +258,11 @@ export class ColorBulb extends deviceBase {
         }
         else {
             await this.offlineOff();
-            await this.debugWarnLog(`Connection Type: ${this.device.connectionType}, refreshStatus will not happen.`);
+            this.debugWarnLog(`Connection Type: ${this.device.connectionType}, refreshStatus will not happen.`);
         }
     }
     async BLERefreshStatus() {
-        await this.debugLog('BLERefreshStatus');
+        this.debugLog('BLERefreshStatus');
         const switchBotBLE = await this.switchbotBLE();
         if (switchBotBLE === undefined) {
             await this.BLERefreshConnection(switchBotBLE);
@@ -279,79 +279,79 @@ export class ColorBulb extends deviceBase {
                     await this.updateHomeKitCharacteristics();
                 }
                 else {
-                    await this.errorLog(`failed to get serviceData, serviceData: ${JSON.stringify(serviceData)}`);
+                    this.errorLog(`failed to get serviceData, serviceData: ${JSON.stringify(serviceData)}`);
                     await this.BLERefreshConnection(switchBotBLE);
                 }
             })();
         }
     }
     async registerPlatformBLE() {
-        await this.debugLog('registerPlatformBLE');
+        this.debugLog('registerPlatformBLE');
         if (this.config.options?.BLE) {
-            await this.debugLog('is listening to Platform BLE.');
+            this.debugLog('is listening to Platform BLE.');
             try {
                 const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId);
                 this.device.bleMac = formattedDeviceId;
-                await this.debugLog(`bleMac: ${this.device.bleMac}`);
+                this.debugLog(`bleMac: ${this.device.bleMac}`);
                 this.platform.bleEventHandler[this.device.bleMac] = async (context) => {
                     try {
-                        await this.debugLog(`received BLE: ${JSON.stringify(context)}`);
+                        this.debugLog(`received BLE: ${JSON.stringify(context)}`);
                         this.serviceData = context;
                         await this.BLEparseStatus();
                         await this.updateHomeKitCharacteristics();
                     }
                     catch (e) {
-                        await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e.message ?? e}`);
+                        this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e.message ?? e}`);
                     }
                 };
             }
             catch (error) {
-                await this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
+                this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
             }
         }
         else {
-            await this.debugLog('is not listening to Platform BLE');
+            this.debugLog('is not listening to Platform BLE');
         }
     }
     async openAPIRefreshStatus() {
-        await this.debugLog('openAPIRefreshStatus');
+        this.debugLog('openAPIRefreshStatus');
         try {
-            const { body } = await this.deviceRefreshStatus();
-            const deviceStatus = await body;
-            await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+            const response = await this.deviceRefreshStatus();
+            const deviceStatus = response.body;
+            this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
             if (await this.successfulStatusCodes(deviceStatus)) {
-                await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 this.deviceStatus = deviceStatus.body;
                 await this.openAPIparseStatus();
                 await this.updateHomeKitCharacteristics();
             }
             else {
-                await this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-                await this.debugWarnLog(deviceStatus);
+                this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                this.debugWarnLog(deviceStatus);
             }
         }
         catch (e) {
             await this.apiError(e);
-            await this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+            this.errorLog(`failed openAPIRefreshStatus with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
         }
     }
     async registerWebhook() {
         if (this.device.webhook) {
-            await this.debugLog('is listening webhook.');
+            this.debugLog('is listening webhook.');
             this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
                 try {
-                    await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
+                    this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
                     this.webhookContext = context;
                     await this.parseStatusWebhook();
                     await this.updateHomeKitCharacteristics();
                 }
                 catch (e) {
-                    await this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e.message ?? e}`);
+                    this.errorLog(`failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e.message ?? e}`);
                 }
             };
         }
         else {
-            await this.debugLog('is not listening webhook.');
+            this.debugLog('is not listening webhook.');
         }
     }
     /**
@@ -367,45 +367,45 @@ export class ColorBulb extends deviceBase {
      */
     async pushChanges() {
         if (!this.device.enableCloudService && this.OpenAPI) {
-            await this.errorLog(`pushChanges enableCloudService: ${this.device.enableCloudService}`);
+            this.errorLog(`pushChanges enableCloudService: ${this.device.enableCloudService}`);
         }
         else if (this.BLE) {
             await this.BLEpushChanges();
             if (this.LightBulb.On) {
                 // Push Brightness Update
-                await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
+                this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
                 await this.BLEpushBrightnessChanges();
                 // Push ColorTemperature Update
-                await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+                this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
                 await this.BLEpushColorTemperatureChanges();
                 // Push Hue & Saturation Update
-                await this.debugLog(`Hue: ${this.LightBulb.Hue}, Saturation: ${this.LightBulb.Saturation}`);
+                this.debugLog(`Hue: ${this.LightBulb.Hue}, Saturation: ${this.LightBulb.Saturation}`);
                 await this.BLEpushRGBChanges();
             }
             else {
-                await this.debugLog('BLE (Brightness), (ColorTemperature), (Hue), & (Saturation) changes will not happen, as the device is OFF.');
+                this.debugLog('BLE (Brightness), (ColorTemperature), (Hue), & (Saturation) changes will not happen, as the device is OFF.');
             }
         }
         else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIpushChanges();
             if (this.LightBulb.On) {
                 // Push Brightness Update
-                await this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
+                this.debugLog(`Brightness: ${this.LightBulb.Brightness}`);
                 await this.pushBrightnessChanges();
                 // Push ColorTemperature Update
-                await this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+                this.debugLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
                 await this.pushColorTemperatureChanges();
                 // Push Hue & Saturation Update
-                await this.debugLog(`Hue: ${this.LightBulb.Hue}, Saturation: ${this.LightBulb.Saturation}`);
+                this.debugLog(`Hue: ${this.LightBulb.Hue}, Saturation: ${this.LightBulb.Saturation}`);
                 await this.pushHueSaturationChanges();
             }
             else {
-                await this.debugLog('openAPI (Brightness), (ColorTemperature), (Hue), & (Saturation) changes will not happen, as the device is OFF.');
+                this.debugLog('openAPI (Brightness), (ColorTemperature), (Hue), & (Saturation) changes will not happen, as the device is OFF.');
             }
         }
         else {
             await this.offlineOff();
-            await this.debugWarnLog(`Connection Type: ${this.device.connectionType}, pushChanges will not happen.`);
+            this.debugWarnLog(`Connection Type: ${this.device.connectionType}, pushChanges will not happen.`);
         }
         // Refresh the status from the API
         interval(15000)
@@ -416,21 +416,21 @@ export class ColorBulb extends deviceBase {
         });
     }
     async BLEpushChanges() {
-        await this.debugLog('BLEpushChanges');
+        this.debugLog('BLEpushChanges');
         if (this.LightBulb.On !== this.accessory.context.On) {
-            await this.debugLog(`BLEpushChanges On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
+            this.debugLog(`BLEpushChanges On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
             const switchBotBLE = await this.platform.connectBLE(this.accessory, this.device);
             try {
                 const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId);
                 this.device.bleMac = formattedDeviceId;
-                await this.debugLog(`bleMac: ${this.device.bleMac}`);
+                this.debugLog(`bleMac: ${this.device.bleMac}`);
                 if (switchBotBLE !== false) {
                     switchBotBLE
                         .discover({ model: this.device.bleModel, id: this.device.bleMac })
                         .then(async (device_list) => {
-                        await this.infoLog(`On: ${this.LightBulb.On}`);
+                        this.infoLog(`On: ${this.LightBulb.On}`);
                         return await this.retryBLE({
-                            max: await this.maxRetryBLE(),
+                            max: this.maxRetryBLE(),
                             fn: async () => {
                                 if (this.LightBulb.On) {
                                     return await device_list[0].turnOn();
@@ -442,69 +442,69 @@ export class ColorBulb extends deviceBase {
                         });
                     })
                         .then(async () => {
-                        await this.successLog(`On: ${this.LightBulb.On} sent over SwitchBot BLE,  sent successfully`);
+                        this.successLog(`On: ${this.LightBulb.On} sent over SwitchBot BLE,  sent successfully`);
                         await this.updateHomeKitCharacteristics();
                     })
                         .catch(async (e) => {
                         await this.apiError(e);
-                        await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                        this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
                         await this.BLEPushConnection();
                     });
                 }
                 else {
-                    await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
+                    this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
                     await this.BLEPushConnection();
                 }
             }
             catch (error) {
-                await this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
+                this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
             }
         }
         else {
-            await this.debugLog(`No changes (BLEpushChanges), On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
+            this.debugLog(`No changes (BLEpushChanges), On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
         }
     }
     async BLEpushBrightnessChanges() {
-        await this.debugLog('BLEpushBrightnessChanges');
+        this.debugLog('BLEpushBrightnessChanges');
         if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
             const switchBotBLE = await this.platform.connectBLE(this.accessory, this.device);
             try {
                 const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId);
                 this.device.bleMac = formattedDeviceId;
-                await this.debugLog(`bleMac: ${this.device.bleMac}`);
+                this.debugLog(`bleMac: ${this.device.bleMac}`);
                 if (switchBotBLE !== false) {
                     switchBotBLE
                         .discover({ model: this.device.bleModel, id: this.device.bleMac })
                         .then(async (device_list) => {
                         const deviceList = device_list;
-                        await this.infoLog(`Target Brightness: ${this.LightBulb.Brightness}`);
+                        this.infoLog(`Target Brightness: ${this.LightBulb.Brightness}`);
                         return await deviceList[0].setBrightness(Number(this.LightBulb.Brightness));
                     })
                         .then(async () => {
-                        await this.successLog(`Brightness: ${this.LightBulb.Brightness} sent over SwitchBot BLE,  sent successfully`);
+                        this.successLog(`Brightness: ${this.LightBulb.Brightness} sent over SwitchBot BLE,  sent successfully`);
                         await this.updateHomeKitCharacteristics();
                     })
                         .catch(async (e) => {
                         await this.apiError(e);
-                        await this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                        this.errorLog(`failed BLEpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
                         await this.BLEPushConnection();
                     });
                 }
                 else {
-                    await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
+                    this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
                     await this.BLEPushConnection();
                 }
             }
             catch (error) {
-                await this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
+                this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
             }
         }
         else {
-            await this.debugLog(`No changes (BLEpushBrightnessChanges), Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
+            this.debugLog(`No changes (BLEpushBrightnessChanges), Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
         }
     }
     async BLEpushColorTemperatureChanges() {
-        await this.debugLog('BLEpushColorTemperatureChanges');
+        this.debugLog('BLEpushColorTemperatureChanges');
         if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
             const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
             this.accessory.context.kelvin = kelvin;
@@ -512,82 +512,82 @@ export class ColorBulb extends deviceBase {
             try {
                 const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId);
                 this.device.bleMac = formattedDeviceId;
-                await this.debugLog(`bleMac: ${this.device.bleMac}`);
+                this.debugLog(`bleMac: ${this.device.bleMac}`);
                 if (switchBotBLE !== false) {
                     switchBotBLE
                         .discover({ model: this.device.bleModel, id: this.device.bleMac })
                         .then(async (device_list) => {
                         const deviceList = device_list;
-                        await this.infoLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
+                        this.infoLog(`ColorTemperature: ${this.LightBulb.ColorTemperature}`);
                         return await deviceList[0].setColorTemperature(kelvin);
                     })
                         .then(async () => {
-                        await this.successLog(`ColorTemperature: ${this.LightBulb.ColorTemperature} sent over SwitchBot BLE,  sent successfully`);
+                        this.successLog(`ColorTemperature: ${this.LightBulb.ColorTemperature} sent over SwitchBot BLE,  sent successfully`);
                         await this.updateHomeKitCharacteristics();
                     })
                         .catch(async (e) => {
                         await this.apiError(e);
-                        await this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                        this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
                         await this.BLEPushConnection();
                     });
                 }
                 else {
-                    await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
+                    this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
                     await this.BLEPushConnection();
                 }
             }
             catch (error) {
-                await this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
+                this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
             }
         }
         else {
-            await this.debugLog(`No changes (BLEpushColorTemperatureChanges), ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
+            this.debugLog(`No changes (BLEpushColorTemperatureChanges), ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
         }
     }
     async BLEpushRGBChanges() {
-        await this.debugLog('BLEpushRGBChanges');
+        this.debugLog('BLEpushRGBChanges');
         if ((this.LightBulb.Hue !== this.accessory.context.Hue) || (this.LightBulb.Saturation !== this.accessory.context.Saturation)) {
-            await this.debugLog(`Hue: ${JSON.stringify(this.LightBulb.Hue)}, Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
+            this.debugLog(`Hue: ${JSON.stringify(this.LightBulb.Hue)}, Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
             const [red, green, blue] = hs2rgb(this.LightBulb.Hue, this.LightBulb.Saturation);
-            await this.debugLog(`rgb: ${JSON.stringify([red, green, blue])}`);
+            this.debugLog(`rgb: ${JSON.stringify([red, green, blue])}`);
             const switchBotBLE = await this.platform.connectBLE(this.accessory, this.device);
             try {
                 const formattedDeviceId = formatDeviceIdAsMac(this.device.deviceId);
                 this.device.bleMac = formattedDeviceId;
-                await this.debugLog(`bleMac: ${this.device.bleMac}`);
+                this.debugLog(`bleMac: ${this.device.bleMac}`);
                 if (switchBotBLE !== false) {
                     switchBotBLE
                         .discover({ model: this.device.bleModel, id: this.device.bleMac })
                         .then(async (device_list) => {
                         const deviceList = device_list;
-                        await this.infoLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)}`);
+                        this.infoLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)}`);
                         return await deviceList[0].setRGB(Number(this.LightBulb.Brightness), red, green, blue);
                     })
                         .then(async () => {
-                        await this.successLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)} sent over SwitchBot BLE,  sent successfully`);
+                        this.successLog(`RGB: ${(this.LightBulb.Brightness, red, green, blue)} sent over SwitchBot BLE,  sent successfully`);
                         await this.updateHomeKitCharacteristics();
                     })
                         .catch(async (e) => {
                         await this.apiError(e);
-                        await this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                        this.errorLog(`failed BLEpushRGBChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
                         await this.BLEPushConnection();
                     });
                 }
                 else {
-                    await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
+                    this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(switchBotBLE)}`);
                     await this.BLEPushConnection();
                 }
             }
             catch (error) {
-                await this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
+                this.errorLog(`failed to format device ID as MAC, Error: ${error}`);
             }
         }
         else {
-            await this.debugLog(`No changes (BLEpushRGBChanges), Hue: ${this.LightBulb.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
+            this.debugLog(`No changes (BLEpushRGBChanges), Hue: ${this.LightBulb.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
         }
     }
     async openAPIpushChanges() {
-        await this.debugLog('openAPIpushChanges');
+        this.debugLog('openAPIpushChanges');
         if (this.LightBulb.On !== this.accessory.context.On) {
             const command = this.LightBulb.On ? 'turnOn' : 'turnOff';
             const bodyChange = {
@@ -595,13 +595,13 @@ export class ColorBulb extends deviceBase {
                 parameter: 'default',
                 commandType: 'command',
             };
-            await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
+            this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
             try {
-                const { body } = await this.pushChangeRequest(bodyChange);
-                const deviceStatus = await body;
-                await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                const response = await this.pushChangeRequest(bodyChange);
+                const deviceStatus = response.body;
+                this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 if (await this.successfulStatusCodes(deviceStatus)) {
-                    await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                    this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                     await this.updateHomeKitCharacteristics();
                 }
                 else {
@@ -610,31 +610,31 @@ export class ColorBulb extends deviceBase {
             }
             catch (e) {
                 await this.apiError(e);
-                await this.errorLog(`failed openAPIpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`failed openAPIpushChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
         else {
-            await this.debugLog(`No changes (openAPIpushChanges), On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
+            this.debugLog(`No changes (openAPIpushChanges), On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
         }
     }
     async pushHueSaturationChanges() {
-        await this.debugLog('pushHueSaturationChanges');
+        this.debugLog('pushHueSaturationChanges');
         if ((this.LightBulb.Hue !== this.accessory.context.Hue) || (this.LightBulb.Saturation !== this.accessory.context.Saturation)) {
-            await this.debugLog(`Hue: ${JSON.stringify(this.LightBulb.Hue)}, Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
+            this.debugLog(`Hue: ${JSON.stringify(this.LightBulb.Hue)}, Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
             const [red, green, blue] = hs2rgb(this.LightBulb.Hue, this.LightBulb.Saturation);
-            await this.debugLog(`rgb: ${JSON.stringify([red, green, blue])}`);
+            this.debugLog(`rgb: ${JSON.stringify([red, green, blue])}`);
             const bodyChange = {
                 command: 'setColor',
                 parameter: `${red}:${green}:${blue}`,
                 commandType: 'command',
             };
-            await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
+            this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
             try {
-                const { body } = await this.pushChangeRequest(bodyChange);
-                const deviceStatus = await body;
-                await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                const response = await this.pushChangeRequest(bodyChange);
+                const deviceStatus = response.body;
+                this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 if (await this.successfulStatusCodes(deviceStatus)) {
-                    await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                    this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                     await this.updateHomeKitCharacteristics();
                 }
                 else {
@@ -643,15 +643,15 @@ export class ColorBulb extends deviceBase {
             }
             catch (e) {
                 await this.apiError(e);
-                await this.errorLog(`failed pushHueSaturationChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`failed pushHueSaturationChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
         else {
-            await this.debugLog(`No changes (pushHueSaturationChanges), Hue: ${this.LightBulb.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
+            this.debugLog(`No changes (pushHueSaturationChanges), Hue: ${this.LightBulb.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
         }
     }
     async pushColorTemperatureChanges() {
-        await this.debugLog('pushColorTemperatureChanges');
+        this.debugLog('pushColorTemperatureChanges');
         if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
             const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
             this.accessory.context.kelvin = kelvin;
@@ -660,13 +660,13 @@ export class ColorBulb extends deviceBase {
                 parameter: `${kelvin}`,
                 commandType: 'command',
             };
-            await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
+            this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
             try {
-                const { body } = await this.pushChangeRequest(bodyChange);
-                const deviceStatus = await body;
-                await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                const response = await this.pushChangeRequest(bodyChange);
+                const deviceStatus = response.body;
+                this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 if (await this.successfulStatusCodes(deviceStatus)) {
-                    await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                    this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                     await this.updateHomeKitCharacteristics();
                 }
                 else {
@@ -675,28 +675,28 @@ export class ColorBulb extends deviceBase {
             }
             catch (e) {
                 await this.apiError(e);
-                await this.errorLog(`failed pushColorTemperatureChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`failed pushColorTemperatureChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
         else {
-            await this.debugLog(`No changes (pushColorTemperatureChanges), ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
+            this.debugLog(`No changes (pushColorTemperatureChanges), ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
         }
     }
     async pushBrightnessChanges() {
-        await this.debugLog('pushBrightnessChanges');
+        this.debugLog('pushBrightnessChanges');
         if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
             const bodyChange = {
                 command: 'setBrightness',
                 parameter: `${this.LightBulb.Brightness}`,
                 commandType: 'command',
             };
-            await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
+            this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`);
             try {
-                const { body } = await this.pushChangeRequest(bodyChange);
-                const deviceStatus = await body;
-                await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                const response = await this.pushChangeRequest(bodyChange);
+                const deviceStatus = response.body;
+                this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 if (await this.successfulStatusCodes(deviceStatus)) {
-                    await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
+                    this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                     await this.updateHomeKitCharacteristics();
                 }
                 else {
@@ -705,11 +705,11 @@ export class ColorBulb extends deviceBase {
             }
             catch (e) {
                 await this.apiError(e);
-                await this.errorLog(`failed pushBrightnessChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`failed pushBrightnessChanges with ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
             }
         }
         else {
-            await this.debugLog(`No changes (pushBrightnessChanges), Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
+            this.debugLog(`No changes (pushBrightnessChanges), Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
         }
     }
     /**
@@ -717,10 +717,10 @@ export class ColorBulb extends deviceBase {
      */
     async OnSet(value) {
         if (this.LightBulb.On !== this.accessory.context.On) {
-            await this.infoLog(`Set On: ${value}`);
+            this.infoLog(`Set On: ${value}`);
         }
         else {
-            await this.debugLog(`No Changes, On: ${value}`);
+            this.debugLog(`No Changes, On: ${value}`);
         }
         this.LightBulb.On = value;
         this.doColorBulbUpdate.next();
@@ -730,7 +730,7 @@ export class ColorBulb extends deviceBase {
      */
     async BrightnessSet(value) {
         if (this.LightBulb.On && (this.LightBulb.Brightness !== this.accessory.context.Brightness)) {
-            await this.infoLog(`Set Brightness: ${value}`);
+            this.infoLog(`Set Brightness: ${value}`);
         }
         else {
             if (this.LightBulb.On) {
@@ -827,21 +827,21 @@ export class ColorBulb extends deviceBase {
     async getAdaptiveLightingSettings(accessory, device) {
         // Adaptive Lighting
         this.adaptiveLighting = accessory.context.adaptiveLighting ?? true;
-        await this.debugLog(`adaptiveLighting: ${this.adaptiveLighting}`);
+        this.debugLog(`adaptiveLighting: ${this.adaptiveLighting}`);
         // Adaptive Lighting Shift
         this.adaptiveLightingShift = device.adaptiveLightingShift ?? 0;
         this.debugLog(`adaptiveLightingShift: ${this.adaptiveLightingShift}`);
     }
     async BLEPushConnection() {
         if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
-            await this.warnLog('Using OpenAPI Connection to Push Changes');
+            this.warnLog('Using OpenAPI Connection to Push Changes');
             await this.openAPIpushChanges();
         }
     }
     async BLERefreshConnection(switchbot) {
-        await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+        this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
         if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
-            await this.warnLog('Using OpenAPI Connection to Refresh Status');
+            this.warnLog('Using OpenAPI Connection to Refresh Status');
             await this.openAPIRefreshStatus();
         }
     }