@switchbot/homebridge-switchbot 2.0.0-beta.9 → 2.0.1-beta.0

package/dist/device/colorbulb.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColorBulb = void 0;
 const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
+const super_stringify_1 = __importDefault(require("super-stringify"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const settings_1 = require("../settings");
@@ -19,24 +20,16 @@ class ColorBulb {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        // 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.logs(device);
         this.scan(device);
         this.refreshRate(device);
         this.adaptiveLighting(device);
         this.config(device);
-        if (this.On === undefined) {
-            this.On = false;
-        }
-        else {
-            this.On = this.accessory.context.On;
-        }
-        this.Hue = 0;
-        this.Brightness = 0;
-        this.Saturation = 0;
-        this.ColorTemperature = 140;
-        this.minKelvin = 2000;
-        this.maxKelvin = 9000;
+        this.context();
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doColorBulbUpdate = new rxjs_1.Subject();
         this.colorBulbUpdateInProgress = false;
@@ -59,7 +52,7 @@ class ColorBulb {
             this.accessory.removeService(this.lightBulbService);
             this.lightBulbService = this.accessory.addService(this.platform.Service.Lightbulb);
             this.accessory.context.adaptiveLighting = false;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
         }
         // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
         // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -83,7 +76,6 @@ class ColorBulb {
         })
             .onSet(this.BrightnessSet.bind(this));
         // handle ColorTemperature events using the ColorTemperature characteristic
-        this.debugLog(`Color Bulb: ${accessory.displayName} Add ColorTemperature Characteristic`);
         this.lightBulbService
             .getCharacteristic(this.platform.Characteristic.ColorTemperature)
             .setProps({
@@ -119,14 +111,14 @@ class ColorBulb {
             return this.Saturation;
         })
             .onSet(this.SaturationSet.bind(this));
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
         if (this.adaptiveLightingShift !== -1) {
             this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.lightBulbService, {
                 customTemperatureAdjustment: this.adaptiveLightingShift,
             });
             this.accessory.configureController(this.AdaptiveLightingController);
             this.accessory.context.adaptiveLighting = true;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
                 ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
         }
         // Update Homekit
@@ -148,25 +140,36 @@ class ColorBulb {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
-                }
                 this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
+                    + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
             }
             this.colorBulbUpdateInProgress = false;
+            // Refresh the status from the API
+            (0, rxjs_1.interval)(15000)
+                .pipe((0, operators_1.skipWhile)(() => this.colorBulbUpdateInProgress))
+                .pipe((0, operators_1.take)(1))
+                .subscribe(async () => {
+                await this.refreshStatus();
+            });
         });
     }
+    /**
+     * Parse the device status from the SwitchBot api
+     */
     async parseStatus() {
-        if (this.SwitchToOpenAPI || !this.device.ble) {
+        /*if (this.BLE) {
+          await this.BLEparseStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIparseStatus();
         }
         else {
-            await this.BLEparseStatus();
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, parseStatus will not happen.`);
         }
     }
     async BLEparseStatus() {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // State
         switch (this.state) {
             case 'on':
@@ -175,9 +178,10 @@ class ColorBulb {
             default:
                 this.On = false;
         }
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
     }
     async openAPIparseStatus() {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
         switch (this.power) {
             case 'on':
                 this.On = true;
@@ -185,52 +189,59 @@ class ColorBulb {
             default:
                 this.On = false;
         }
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
         // Brightness
         this.Brightness = Number(this.brightness);
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
         // Color, Hue & Brightness
         if (this.color) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} color: ${JSON.stringify(this.color)}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${(0, super_stringify_1.default)(this.color)}`);
             const [red, green, blue] = this.color.split(':');
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${(0, super_stringify_1.default)(red)}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${(0, super_stringify_1.default)(green)}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${(0, super_stringify_1.default)(blue)}`);
             const [hue, saturation] = (0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue));
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} hs: ${JSON.stringify((0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue)))}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` hs: ${(0, super_stringify_1.default)((0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue)))}`);
             // Hue
             this.Hue = hue;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
             // Saturation
             this.Saturation = saturation;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
         }
         // ColorTemperature
         if (!Number.isNaN(this.colorTemperature)) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.colorTemperature}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.colorTemperature}`);
             const mired = Math.round(1000000 / this.colorTemperature);
             this.ColorTemperature = Number(mired);
             this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
         }
     }
+    /**
+     * Asks the SwitchBot API for the latest device information
+     */
     async refreshStatus() {
-        if (this.device.ble) {
-            await this.BLERefreshStatus();
+        /*if (this.BLE) {
+          await this.BLERefreshStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            await this.openAPIRefreshStatus();
         }
         else {
-            await this.openAPIRefreshStatus();
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, refreshStatus will not happen.`);
         }
     }
     async BLERefreshStatus() {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} BLE refreshStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
         const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
         this.device.bleMac = this.device
             .deviceId.match(/.{1,2}/g)
             .join(':')
             .toLowerCase();
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         this.getCustomBLEAddress(switchbot);
         // Start to monitor advertisement packets
         if (switchbot !== false) {
@@ -243,13 +254,9 @@ class ColorBulb {
                 // Set an event hander
                 switchbot.onadvertisement = (ad) => {
                     this.address = ad.address;
-                    if (this.deviceLogging.includes('debug')) {
-                        this.infoLog(this.address);
-                        this.infoLog(this.device.bleMac);
-                        this.infoLog(`Color Bulb: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-                        this.infoLog(`Color Bulb: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
-                    }
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
+                        + ` BLE Address Found: ${this.address}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(ad.serviceData)}`);
                     this.serviceData = ad.serviceData;
                     //this.state = ad.serviceData.state;
                     //this.delay = ad.serviceData.delay;
@@ -258,19 +265,19 @@ class ColorBulb {
                     //this.wifiRssi = ad.serviceData.wifiRssi;
                     //this.overload = ad.serviceData.overload;
                     //this.currentPower = ad.serviceData.currentPower;
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(ad.serviceData)}`);
                     /*this.debugLog(
-                      `Color Bulb: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
+                      `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
                         `delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
                         `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
                     );*/
                     if (this.serviceData) {
                         this.connected = true;
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                     else {
                         this.connected = false;
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                 };
                 // Wait 2 seconds
@@ -280,69 +287,33 @@ class ColorBulb {
                 // Stop to monitor
                 switchbot.stopScan();
                 if (this.connected) {
-                    this.parseStatus();
+                    this.BLEparseStatus();
                     this.updateHomeKitCharacteristics();
                 }
                 else {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                    if (this.platform.config.credentials?.token) {
-                        this.warnLog(`Color Bulb: ${this.accessory.displayName} Using OpenAPI Connection`);
-                        this.SwitchToOpenAPI = true;
-                        await this.openAPIRefreshStatus();
-                    }
+                    await this.BLERefreshConnection(switchbot);
                 }
             })
                 .catch(async (e) => {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-                }
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`Color Bulb: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    this.SwitchToOpenAPI = true;
-                    await this.openAPIRefreshStatus();
-                }
                 this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}`
+                    + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                await this.BLERefreshConnection(switchbot);
             });
         }
         else {
-            await this.BLEconnection(switchbot);
-        }
-    }
-    async getCustomBLEAddress(switchbot) {
-        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: 'u',
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`Color Bulb: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await switchbot.wait(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
-        }
-    }
-    async BLEconnection(switchbot) {
-        this.errorLog(`Color Bulb: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
-        if (this.platform.config.credentials?.token) {
-            this.warnLog(`Color Bulb: ${this.accessory.displayName} Using OpenAPI Connection`);
-            this.SwitchToOpenAPI = true;
-            await this.openAPIRefreshStatus();
+            await this.BLERefreshConnection(switchbot);
         }
     }
     async openAPIRefreshStatus() {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
             const t = Date.now();
             const nonce = 'requestID';
             const data = this.platform.config.credentials?.token + t + nonce;
             const signTerm = crypto_1.default.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
             const sign = signTerm.toString('base64');
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
             const options = {
                 hostname: settings_1.HostDomain,
                 port: 443,
@@ -357,39 +328,38 @@ class ColorBulb {
                 },
             };
             const req = https_1.default.request(options, (res) => {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} Refresh statusCode: ${res.statusCode}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus statusCode: ${res.statusCode}`);
+                this.statusCode({ res });
                 let rawData = '';
                 res.on('data', (d) => {
                     rawData += d;
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                 });
                 res.on('end', () => {
                     try {
                         this.deviceStatus = JSON.parse(rawData);
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
                         this.power = this.deviceStatus.body.power;
                         this.color = this.deviceStatus.body.color;
                         this.brightness = this.deviceStatus.body.brightness;
                         this.colorTemperature = this.deviceStatus.body.colorTemperature;
-                        this.parseStatus();
+                        this.openAPIparseStatus();
                         this.updateHomeKitCharacteristics();
                     }
                     catch (e) {
-                        this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
+                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                     }
                 });
             });
             req.on('error', (e) => {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
             });
             req.end();
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     /**
@@ -404,7 +374,60 @@ class ColorBulb {
      *
      */
     async pushChanges() {
+        /*if (this.BLE) {
+          await this.BLEpushChanges();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            await this.openAPIpushChanges();
+        }
+        else {
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, pushChanges will not happen.`);
+        }
+        (0, rxjs_1.interval)(5000)
+            .pipe((0, operators_1.take)(1))
+            .subscribe(async () => {
+            await this.refreshStatus();
+        });
+    }
+    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}`);
+            const switchbot = await this.platform.connectBLE();
+            // Convert to BLE Address
+            this.device.bleMac = this.device
+                .deviceId.match(/.{1,2}/g)
+                .join(':')
+                .toLowerCase();
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+            switchbot
+                .discover({
+                model: 'u',
+                id: this.device.bleMac,
+            })
+                .then((device_list) => {
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
+                return this.turnOnOff(device_list);
+            })
+                .then(() => {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+                this.On = false;
+            })
+                .catch(async (e) => {
+                this.apiError(e);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
+                    + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
+                await this.BLEPushConnection();
+            });
+        }
+        else {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, `
+                + `OnCached: ${this.accessory.context.On}`);
+        }
+    }
+    async openAPIpushChanges() {
         try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
             if (this.On !== this.accessory.context.On) {
                 // Make Push On request to the API
                 const t = Date.now();
@@ -414,7 +437,7 @@ class ColorBulb {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
                 let command = '';
                 if (this.On) {
                     command = 'turnOn';
@@ -422,12 +445,12 @@ class ColorBulb {
                 else {
                     command = 'turnOff';
                 }
-                const body = JSON.stringify({
+                const body = (0, super_stringify_1.default)({
                     'command': `${command}`,
                     'parameter': 'default',
                     'commandType': 'command',
                 });
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -443,18 +466,22 @@ class ColorBulb {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges statusCode: ${res.statusCode}`);
                     this.statusCode({ res });
                     res.on('data', d => {
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${(0, super_stringify_1.default)(req)}`);
+            }
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `On: ${this.On}, `
+                    + `OnCached: ${this.accessory.context.On}`);
             }
             // Push Brightness Update
             if (this.On) {
@@ -470,20 +497,19 @@ class ColorBulb {
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     async pushHueSaturationChanges() {
         try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges`);
             if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${(0, super_stringify_1.default)(this.Hue)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${(0, super_stringify_1.default)(this.Saturation)}`);
                 const [red, green, blue] = (0, settings_1.hs2rgb)(Number(this.Hue), Number(this.Saturation));
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${(0, super_stringify_1.default)([red, green, blue])}`);
                 // Make Push Hue/Saturation request to the API
                 const t = Date.now();
                 const nonce = 'requestID';
@@ -492,13 +518,13 @@ class ColorBulb {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
-                const body = JSON.stringify({
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+                const body = (0, super_stringify_1.default)({
                     'command': 'setColor',
                     'parameter': `${red}:${green}:${blue}`,
                     'commandType': 'command',
                 });
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -514,34 +540,32 @@ class ColorBulb {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges statusCode: ${res.statusCode}`);
                     res.on('data', d => {
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushHueSaturationChanges: ${JSON.stringify(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges: ${(0, super_stringify_1.default)(req)}`);
             }
             else {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} No Changes.` +
-                    `Hue: ${this.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation},`
-                    + ` SaturationCached: ${this.accessory.context.Saturation}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.Hue}, `
+                    + `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     async pushColorTemperatureChanges() {
         try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushColorTemperatureChanges`);
             if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
                 const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
                 this.cacheKelvin = kelvin;
@@ -553,13 +577,13 @@ class ColorBulb {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
-                const body = JSON.stringify({
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+                const body = (0, super_stringify_1.default)({
                     'command': 'setColorTemperature',
                     'parameter': `${kelvin}`,
                     'commandType': 'command',
                 });
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -575,34 +599,33 @@ class ColorBulb {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
                     res.on('data', d => {
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushColorTemperatureChanges: ${JSON.stringify(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushColorTemperatureChanges: ${(0, super_stringify_1.default)(req)}`);
                 this.accessory.context.ColorTemperature = this.ColorTemperature;
             }
             else {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} No Changes.` +
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.` +
                     `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
     async pushBrightnessChanges() {
         try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges`);
             if (this.Brightness !== this.accessory.context.Brightness) {
                 // Make Push On request to the API
                 const t = Date.now();
@@ -612,13 +635,13 @@ class ColorBulb {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} sign: ${sign}`);
-                const body = JSON.stringify({
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+                const body = (0, super_stringify_1.default)({
                     'command': 'setBrightness',
                     'parameter': `${this.Brightness}`,
                     'commandType': 'command',
                 });
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
@@ -634,112 +657,290 @@ class ColorBulb {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges statusCode: ${res.statusCode}`);
                     res.on('data', d => {
-                        this.debugLog(`Color Bulb: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} error message: ${e.message}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
                 req.write(body);
                 req.end();
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushBrightnessChanges: ${JSON.stringify(req)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges: ${(0, super_stringify_1.default)(req)}`);
             }
             else {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} No Changes.` + `Brightness: ${this.Brightness}, `
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.` + `Brightness: ${this.Brightness}, `
                     + `BrightnessCached: ${this.accessory.context.Brightness}`);
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
             this.apiError(e);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
+                + ` Connection, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
     }
+    /**
+     * Handle requests to set the value of the "On" characteristic
+     */
+    async OnSet(value) {
+        if (this.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.doColorBulbUpdate.next();
+    }
+    /**
+     * Handle requests to set the value of the "Brightness" characteristic
+     */
+    async BrightnessSet(value) {
+        if (this.Brightness === this.accessory.context.Brightness) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Brightness: ${value}`);
+        }
+        else if (this.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.doColorBulbUpdate.next();
+    }
+    /**
+     * Handle requests to set the value of the "ColorTemperature" characteristic
+     */
+    async ColorTemperatureSet(value) {
+        if (this.ColorTemperature === this.accessory.context.ColorTemperature) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set ColorTemperature: ${value}`);
+        }
+        else if (this.On) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
+        }
+        else {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
+        }
+        // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
+        const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
+        // Check and increase/decrease kelvin to range of device
+        const k = Math.min(Math.max(kelvin, this.minKelvin), this.maxKelvin);
+        if (!this.accessory.context.On || this.cacheKelvin === k) {
+            return;
+        }
+        // Updating the hue/sat to the corresponding values mimics native adaptive lighting
+        const hs = (0, settings_1.m2hs)(value);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, hs[0]);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, hs[1]);
+        this.ColorTemperature = value;
+        this.doColorBulbUpdate.next();
+    }
+    /**
+     * Handle requests to set the value of the "Hue" characteristic
+     */
+    async HueSet(value) {
+        if (this.Hue === this.accessory.context.Hue) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Hue: ${value}`);
+        }
+        else if (this.On) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+        }
+        else {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
+        }
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+        this.Hue = value;
+        this.doColorBulbUpdate.next();
+    }
+    /**
+     * Handle requests to set the value of the "Saturation" characteristic
+     */
+    async SaturationSet(value) {
+        if (this.Saturation === this.accessory.context.Saturation) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Saturation: ${value}`);
+        }
+        else if (this.On) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+        }
+        else {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
+        }
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+        this.Saturation = value;
+        this.doColorBulbUpdate.next();
+    }
     async updateHomeKitCharacteristics() {
         if (this.On === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
         }
         else {
             this.accessory.context.On = this.On;
             this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, this.On);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
         if (this.Brightness === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
         }
         else {
             this.accessory.context.Brightness = this.Brightness;
             this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, this.Brightness);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
         }
         if (this.ColorTemperature === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
         }
         else {
             this.accessory.context.ColorTemperature = this.ColorTemperature;
             this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, this.ColorTemperature);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
         }
         if (this.Hue === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
         }
         else {
             this.accessory.context.Hue = this.Hue;
             this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, this.Hue);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
         }
         if (this.Saturation === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
         }
         else {
             this.accessory.context.Saturation = this.Saturation;
             this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
         }
     }
-    apiError(e) {
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, e);
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+    async adaptiveLighting(device) {
+        if (device.colorbulb?.adaptiveLightingShift) {
+            this.adaptiveLightingShift = device.colorbulb.adaptiveLightingShift;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+        }
+        else {
+            this.adaptiveLightingShift = 0;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+        }
+    }
+    async getCustomBLEAddress(switchbot) {
+        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);
+            (async () => {
+                // Start to monitor advertisement packets
+                await switchbot.startScan({
+                    model: 'u',
+                });
+                // Set an event handler
+                switchbot.onadvertisement = (ad) => {
+                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${(0, super_stringify_1.default)(ad, null, '  ')}`);
+                };
+                await switchbot.wait(10000);
+                // Stop to monitor
+                switchbot.stopScan();
+            })();
+        }
+    }
+    async BLEPushConnection() {
+        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
+            await this.openAPIpushChanges();
+        }
+    }
+    async BLERefreshConnection(switchbot) {
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+        if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Refresh Status`);
+            await this.openAPIRefreshStatus();
+        }
+    }
+    async turnOnOff(device_list) {
+        return await this.retry({
+            max: await this.maxRetry(),
+            fn: () => {
+                if (this.On) {
+                    return device_list[0].turnOn({ id: this.device.bleMac });
+                }
+                else {
+                    return device_list[0].turnOff({ id: this.device.bleMac });
+                }
+            },
+        });
+    }
+    async retry({ max, fn }) {
+        return fn().catch(async (err) => {
+            if (max === 0) {
+                throw err;
+            }
+            this.infoLog(err);
+            this.infoLog('Retrying');
+            await this.switchbot.wait(1000);
+            return this.retry({ max: max - 1, fn });
+        });
+    }
+    async maxRetry() {
+        let maxRetry;
+        if (this.device.bot?.maxRetry) {
+            maxRetry = this.device.bot?.maxRetry;
+        }
+        else {
+            maxRetry = 5;
+        }
+        return maxRetry;
+    }
+    minStep(device) {
+        if (device.colorbulb?.set_minStep) {
+            this.set_minStep = device.colorbulb?.set_minStep;
+        }
+        else {
+            this.set_minStep = 1;
+        }
+        return this.set_minStep;
+    }
+    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({ res }) {
         switch (res.statusCode) {
             case 151:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Command not supported by this device type.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
                 break;
             case 152:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Device not found.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
                 break;
             case 160:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Command is not supported.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
                 break;
             case 161:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Device is offline.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
                 this.offlineOff();
                 break;
             case 171:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
                 this.offlineOff();
                 break;
             case 190:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command: ${JSON.stringify(res)} format is invalid`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
+                    ` Or command: ${(0, super_stringify_1.default)(res)} format is invalid`);
                 break;
             case 100:
                 if (this.platform.debugMode) {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} Command successfully sent.`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
                 }
                 break;
             default:
                 if (this.platform.debugMode) {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} Unknown statusCode.`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
                 }
         }
     }
@@ -747,68 +948,87 @@ class ColorBulb {
         if (this.device.offline) {
             this.On = false;
             this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+            await this.updateHomeKitCharacteristics();
         }
     }
-    /**
-     * Handle requests to set the value of the "On" characteristic
-     */
-    async OnSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${value}`);
-        this.On = value;
-        this.doColorBulbUpdate.next();
-    }
-    /**
-     * Handle requests to set the value of the "Brightness" characteristic
-     */
-    async BrightnessSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${value}`);
-        this.Brightness = value;
-        this.doColorBulbUpdate.next();
+    apiError(e) {
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, e);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, e);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, e);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, e);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, e);
     }
-    /**
-     * Handle requests to set the value of the "ColorTemperature" characteristic
-     */
-    async ColorTemperatureSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${value}`);
-        // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
-        const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
-        // Check and increase/decrease kelvin to range of device
-        const k = Math.min(Math.max(kelvin, this.minKelvin), this.maxKelvin);
-        if (!this.accessory.context.On || this.cacheKelvin === k) {
-            return;
+    FirmwareRevision(accessory, device) {
+        let FirmwareRevision;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+            + ` accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
+        if (accessory.context.FirmwareRevision) {
+            FirmwareRevision = accessory.context.FirmwareRevision;
         }
-        // Updating the hue/sat to the corresponding values mimics native adaptive lighting
-        const hs = (0, settings_1.m2hs)(value);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, hs[0]);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, hs[1]);
-        this.ColorTemperature = value;
-        this.doColorBulbUpdate.next();
+        else if (device.firmware) {
+            FirmwareRevision = device.firmware;
+        }
+        else {
+            FirmwareRevision = this.platform.version;
+        }
+        return FirmwareRevision;
     }
-    /**
-     * Handle requests to set the value of the "Hue" characteristic
-     */
-    async HueSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${value}`);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
-        this.Hue = value;
-        this.doColorBulbUpdate.next();
+    context() {
+        if (this.On === undefined) {
+            this.On = false;
+        }
+        else {
+            this.On = this.accessory.context.On;
+        }
+        if (this.Hue === undefined) {
+            this.Hue = 0;
+        }
+        else {
+            this.Hue = this.accessory.context.Hue;
+        }
+        if (this.Brightness === undefined) {
+            this.Brightness = 0;
+        }
+        else {
+            this.Brightness = this.accessory.context.Brightness;
+        }
+        if (this.Brightness === undefined) {
+            this.Saturation = 0;
+        }
+        else {
+            this.Saturation = this.accessory.context.Saturation;
+        }
+        if (this.ColorTemperature === undefined) {
+            this.ColorTemperature = 140;
+        }
+        else {
+            this.ColorTemperature = this.accessory.context.ColorTemperature;
+        }
+        this.minKelvin = 2000;
+        this.maxKelvin = 9000;
     }
-    /**
-     * Handle requests to set the value of the "Saturation" characteristic
-     */
-    async SaturationSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${value}`);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
-        this.Saturation = value;
-        this.doColorBulbUpdate.next();
+    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 config(device) {
         let config = {};
         if (device.colorbulb) {
             config = device.colorbulb;
         }
-        if (device.ble) {
-            config['ble'] = device.ble;
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
+        }
+        if (device.external !== undefined) {
+            config['external'] = device.external;
         }
         if (device.logging !== undefined) {
             config['logging'] = device.logging;
@@ -823,85 +1043,26 @@ class ColorBulb {
             config['offline'] = device.offline;
         }
         if (Object.entries(config).length !== 0) {
-            this.infoLog(`Color Bulb: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-        }
-    }
-    async refreshRate(device) {
-        if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Color Bulb: ${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(`Color Bulb: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
-        }
-    }
-    async scan(device) {
-        if (device.scanDuration) {
-            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-            if (device.ble) {
-                this.debugLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
-        }
-        else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.device.ble) {
-                this.debugLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
         }
     }
     async logs(device) {
         if (this.platform.debugMode) {
             this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+            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(`Color Bulb: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+            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(`Color Bulb: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
         }
         else {
             this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-        }
-    }
-    FirmwareRevision(accessory, device) {
-        let FirmwareRevision;
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-        if (accessory.context.FirmwareRevision) {
-            FirmwareRevision = accessory.context.FirmwareRevision;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
-        else if (device.firmware) {
-            FirmwareRevision = device.firmware;
-        }
-        else {
-            FirmwareRevision = this.platform.version;
-        }
-        return FirmwareRevision;
-    }
-    async adaptiveLighting(device) {
-        if (device.colorbulb?.adaptiveLightingShift) {
-            this.adaptiveLightingShift = device.colorbulb.adaptiveLightingShift;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
-        }
-        else {
-            this.adaptiveLightingShift = 0;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
-        }
-    }
-    minStep(device) {
-        if (device.colorbulb?.set_minStep) {
-            this.set_minStep = device.colorbulb?.set_minStep;
-        }
-        else {
-            this.set_minStep = 1;
-        }
-        return this.set_minStep;
     }
     /**
      * Logging for Device
@@ -916,11 +1077,25 @@ class ColorBulb {
             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') {