@switchbot/homebridge-switchbot 2.0.0-beta.19 → 2.0.0-beta.20

package/dist/device/colorbulb.js

@@ -20,25 +20,16 @@ class ColorBulb {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        // Connection
+        this.BLE = (this.device.connectionType === 'BLE' || this.device.connectionType === 'Both');
+        this.OpenAPI = (this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'Both');
         // default placeholders
         this.logs(device);
-        this.openAPI();
         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;
@@ -150,12 +141,9 @@ class ColorBulb {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(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
@@ -167,16 +155,23 @@ class ColorBulb {
             });
         });
     }
+    /**
+     * Parse the device status from the SwitchBot api
+     */
     async parseStatus() {
-        if (this.SwitchToOpenAPI || !this.device.ble) {
+        /*if (this.BLE && !this.SwitchToOpenAPI) {
+          await this.BLEparseStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            this.SwitchToOpenAPI = false;
             await this.openAPIparseStatus();
         }
         else {
-            await this.BLEparseStatus();
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, parseStatus will not happen.`);
         }
     }
     async BLEparseStatus() {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // State
         switch (this.state) {
             case 'on':
@@ -188,6 +183,7 @@ class ColorBulb {
         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;
@@ -225,16 +221,22 @@ class ColorBulb {
             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.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, refreshStatus will not happen.`);
         }
     }
     async BLERefreshStatus() {
-        this.debugLog(`${this.device.deviceType}: ${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
@@ -295,214 +297,223 @@ class ColorBulb {
                     this.updateHomeKitCharacteristics();
                 }
                 else {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                    if (this.platform.config.credentials?.token) {
-                        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-                        this.SwitchToOpenAPI = true;
-                        await this.openAPIRefreshStatus();
-                    }
+                    await this.BLEconnection(switchbot);
                 }
             })
                 .catch(async (e) => {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`${this.device.deviceType}: ${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.BLEconnection(switchbot);
             });
         }
         else {
             await this.BLEconnection(switchbot);
         }
     }
-    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',
+    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(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+            const options = {
+                hostname: settings_1.HostDomain,
+                port: 443,
+                path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
+                method: 'GET',
+                headers: {
+                    Authorization: this.platform.config.credentials?.token,
+                    sign: sign,
+                    nonce: nonce,
+                    t: t,
+                    'Content-Type': 'application/json',
+                },
+            };
+            const req = https_1.default.request(options, (res) => {
+                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(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                 });
-                // 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();
-            })();
+                res.on('end', () => {
+                    try {
+                        this.deviceStatus = JSON.parse(rawData);
+                        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.updateHomeKitCharacteristics();
+                    }
+                    catch (e) {
+                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                    }
+                });
+            });
+            req.on('error', (e) => {
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+            });
+            req.end();
+        }
+        catch (e) {
+            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)}`);
         }
     }
-    async BLEconnection(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.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
-            this.SwitchToOpenAPI = true;
-            await this.openAPIRefreshStatus();
+    /**
+     * Pushes the requested changes to the SwitchBot API
+     * deviceType	      commandType	          Command	               command parameter	                     Description
+     * Color Bulb   -    "command"            "turnOff"                  "default"	              =        set to OFF state
+     * Color Bulb   -    "command"            "turnOn"                   "default"	              =        set to ON state
+     * Color Bulb   -    "command"            "toggle"                   "default"	              =        toggle state
+     * Color Bulb   -    "command"         "setBrightness"	             "{1-100}"	              =        set brightness
+     * Color Bulb   -    "command"           "setColor"	         "{0-255}:{0-255}:{0-255}"	      =        set RGB color value
+     * Color Bulb   -    "command"     "setColorTemperature"	         "{2700-6500}"	            =        set color temperature
+     *
+     */
+    async pushChanges() {
+        /*if (this.BLE) {
+          await this.BLERefreshStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            await this.openAPIpushChanges();
+        }
+        else {
+            this.warnLog(`${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 openAPIRefreshStatus() {
-        if (this.OpenAPI) {
-            try {
+    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)}`);
+                if (this.platform.config.credentials?.token && this.device.connectionType !== 'Both') {
+                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
+                    await this.openAPIpushChanges();
+                }
+            });
+        }
+        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();
                 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 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(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
+                let command = '';
+                if (this.On) {
+                    command = 'turnOn';
+                }
+                else {
+                    command = 'turnOff';
+                }
+                const body = (0, super_stringify_1.default)({
+                    'command': `${command}`,
+                    'parameter': 'default',
+                    'commandType': 'command',
+                });
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
                 const options = {
                     hostname: settings_1.HostDomain,
                     port: 443,
-                    path: `${settings_1.DevicePath}/${this.device.deviceId}/status`,
-                    method: 'GET',
+                    path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
+                    method: 'POST',
                     headers: {
-                        Authorization: this.platform.config.credentials?.token,
-                        sign: sign,
-                        nonce: nonce,
-                        t: t,
+                        'Authorization': this.platform.config.credentials?.token,
+                        'sign': sign,
+                        'nonce': nonce,
+                        't': t,
                         'Content-Type': 'application/json',
+                        'Content-Length': body.length,
                     },
                 };
-                const req = https_1.default.request(options, (res) => {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Refresh statusCode: ${res.statusCode}`);
-                    let rawData = '';
-                    res.on('data', (d) => {
-                        rawData += d;
+                const req = https_1.default.request(options, res => {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges statusCode: ${res.statusCode}`);
+                    this.statusCode({ res });
+                    res.on('data', d => {
                         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
-                    res.on('end', () => {
-                        try {
-                            this.deviceStatus = JSON.parse(rawData);
-                            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${(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.updateHomeKitCharacteristics();
-                        }
-                        catch (e) {
-                            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
-                        }
-                    });
                 });
                 req.on('error', (e) => {
                     this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
                 });
+                req.write(body);
                 req.end();
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${(0, super_stringify_1.default)(req)}`);
             }
-            catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                this.apiError(e);
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `On: ${this.On}, `
+                    + `OnCached: ${this.accessory.context.On}`);
             }
-        }
-        else {
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
-        }
-    }
-    /**
-     * Pushes the requested changes to the SwitchBot API
-     * deviceType	      commandType	          Command	               command parameter	                     Description
-     * Color Bulb   -    "command"            "turnOff"                  "default"	              =        set to OFF state
-     * Color Bulb   -    "command"            "turnOn"                   "default"	              =        set to ON state
-     * Color Bulb   -    "command"            "toggle"                   "default"	              =        toggle state
-     * Color Bulb   -    "command"         "setBrightness"	             "{1-100}"	              =        set brightness
-     * Color Bulb   -    "command"           "setColor"	         "{0-255}:{0-255}:{0-255}"	      =        set RGB color value
-     * Color Bulb   -    "command"     "setColorTemperature"	         "{2700-6500}"	            =        set color temperature
-     *
-     */
-    async pushChanges() {
-        if (this.OpenAPI) {
-            try {
-                if (this.On !== this.accessory.context.On) {
-                    // Make Push On request to the API
-                    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(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
-                    let command = '';
-                    if (this.On) {
-                        command = 'turnOn';
-                    }
-                    else {
-                        command = 'turnOff';
-                    }
-                    const body = (0, super_stringify_1.default)({
-                        'command': `${command}`,
-                        'parameter': 'default',
-                        'commandType': 'command',
-                    });
-                    this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
-                    const options = {
-                        hostname: settings_1.HostDomain,
-                        port: 443,
-                        path: `${settings_1.DevicePath}/${this.device.deviceId}/commands`,
-                        method: 'POST',
-                        headers: {
-                            'Authorization': this.platform.config.credentials?.token,
-                            'sign': sign,
-                            'nonce': nonce,
-                            't': t,
-                            'Content-Type': 'application/json',
-                            'Content-Length': body.length,
-                        },
-                    };
-                    const req = https_1.default.request(options, res => {
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-                        this.statusCode({ res });
-                        res.on('data', d => {
-                            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
-                        });
-                    });
-                    req.on('error', (e) => {
-                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
-                    });
-                    req.write(body);
-                    req.end();
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${(0, super_stringify_1.default)(req)}`);
-                }
-                // Push Brightness Update
-                if (this.On) {
-                    await this.pushBrightnessChanges();
-                }
-                // Push ColorTemperature Update
-                if (this.On) {
-                    await this.pushColorTemperatureChanges();
-                }
-                // Push Hue & Saturation Update
-                if (this.On) {
-                    await this.pushHueSaturationChanges();
-                }
+            // Push Brightness Update
+            if (this.On) {
+                await this.pushBrightnessChanges();
             }
-            catch (e) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-                        + ` Error Message: ${(0, super_stringify_1.default)(e.message)}`);
-                }
-                this.apiError(e);
+            // Push ColorTemperature Update
+            if (this.On) {
+                await this.pushColorTemperatureChanges();
+            }
+            // Push Hue & Saturation Update
+            if (this.On) {
+                await this.pushHueSaturationChanges();
             }
         }
-        else {
-            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
+        catch (e) {
+            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(`${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)}`);
@@ -538,7 +549,7 @@ class ColorBulb {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges statusCode: ${res.statusCode}`);
                     res.on('data', d => {
                         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
@@ -551,22 +562,19 @@ class ColorBulb {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges: ${(0, super_stringify_1.default)(req)}`);
             }
             else {
-                this.debugLog(`${this.device.deviceType}: ${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(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-                    + ` Error Message: ${(0, super_stringify_1.default)(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;
@@ -614,21 +622,19 @@ class ColorBulb {
                 this.accessory.context.ColorTemperature = this.ColorTemperature;
             }
             else {
-                this.debugLog(`${this.device.deviceType}: ${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(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-                    + ` Error Message: ${(0, super_stringify_1.default)(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();
@@ -660,7 +666,7 @@ class ColorBulb {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges statusCode: ${res.statusCode}`);
                     res.on('data', d => {
                         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
@@ -673,18 +679,68 @@ class ColorBulb {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges: ${(0, super_stringify_1.default)(req)}`);
             }
             else {
-                this.debugLog(`${this.device.deviceType}: ${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(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
-                    + ` Error Message: ${(0, super_stringify_1.default)(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) {
+        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) {
+        this.infoLog(`${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) {
+        this.infoLog(`${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) {
+        this.infoLog(`${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) {
+        this.infoLog(`${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) {
@@ -728,13 +784,98 @@ class ColorBulb {
             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 BLEconnection(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.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
+            this.SwitchToOpenAPI = true;
+            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) {
@@ -774,87 +915,66 @@ 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(`${this.device.deviceType}: ${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(`${this.device.deviceType}: ${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(`${this.device.deviceType}: ${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();
-    }
-    /**
-     * Handle requests to set the value of the "Hue" characteristic
-     */
-    async HueSet(value) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} 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) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${value}`);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
-        this.Saturation = value;
-        this.doColorBulbUpdate.next();
+        else if (device.firmware) {
+            FirmwareRevision = device.firmware;
+        }
+        else {
+            FirmwareRevision = this.platform.version;
+        }
+        return FirmwareRevision;
     }
-    async config(device) {
-        let config = {};
-        if (device.colorbulb) {
-            config = device.colorbulb;
+    context() {
+        if (this.On === undefined) {
+            this.On = false;
         }
-        if (device.ble) {
-            config['ble'] = device.ble;
+        else {
+            this.On = this.accessory.context.On;
         }
-        if (device.openAPI !== undefined) {
-            config['openAPI'] = device.openAPI;
+        if (this.Hue === undefined) {
+            this.Hue = 0;
         }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
+        else {
+            this.Hue = this.accessory.context.Hue;
         }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
+        if (this.Brightness === undefined) {
+            this.Brightness = 0;
         }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
+        else {
+            this.Brightness = this.accessory.context.Brightness;
         }
-        if (device.offline !== undefined) {
-            config['offline'] = device.offline;
+        if (this.Brightness === undefined) {
+            this.Saturation = 0;
         }
-        if (Object.entries(config).length !== 0) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
+        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;
     }
     async refreshRate(device) {
         if (device.refreshRate) {
@@ -866,27 +986,28 @@ class ColorBulb {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
-    async openAPI() {
-        if (!this.device.openAPI) {
-            this.OpenAPI = true;
+    async config(device) {
+        let config = {};
+        if (device.colorbulb) {
+            config = device.colorbulb;
         }
-        else {
-            this.OpenAPI = this.device.openAPI;
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
-    }
-    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}`);
-            }
+        if (device.logging !== undefined) {
+            config['logging'] = device.logging;
         }
-        else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.device.ble) {
-                this.debugLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
+        if (device.refreshRate !== undefined) {
+            config['refreshRate'] = device.refreshRate;
+        }
+        if (device.scanDuration !== undefined) {
+            config['scanDuration'] = device.scanDuration;
+        }
+        if (device.offline !== undefined) {
+            config['offline'] = device.offline;
+        }
+        if (Object.entries(config).length !== 0) {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${(0, super_stringify_1.default)(config)}`);
         }
     }
     async logs(device) {
@@ -907,42 +1028,6 @@ class ColorBulb {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
-    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;
-        }
-        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(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
-        }
-        else {
-            this.adaptiveLightingShift = 0;
-            this.debugLog(`${this.device.deviceType}: ${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
      */