@switchbot/homebridge-switchbot 2.0.0-beta.8 → 2.0.0

package/dist/device/plug.js

@@ -7,6 +7,7 @@ exports.Plug = void 0;
 const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
 const rxjs_1 = require("rxjs");
+const super_stringify_1 = __importDefault(require("super-stringify"));
 const operators_1 = require("rxjs/operators");
 const settings_1 = require("../settings");
 class Plug {
@@ -14,17 +15,15 @@ class Plug {
         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.config(device);
-        if (this.On === undefined) {
-            this.On = false;
-        }
-        else {
-            this.On = this.accessory.context.On;
-        }
+        this.context();
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doPlugUpdate = new rxjs_1.Subject();
         this.plugUpdateInProgress = false;
@@ -52,7 +51,7 @@ class Plug {
         // each service must implement at-minimum the "required characteristics" for the given service type
         // see https://developers.homebridge.io/#/service/Outlet
         // create handlers for required characteristics
-        this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
+        this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -72,25 +71,30 @@ class Plug {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Plug: ${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.plugUpdateInProgress = false;
         });
     }
+    /**
+     * 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(`Plug: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // State
         switch (this.state) {
             case 'on':
@@ -99,9 +103,10 @@ class Plug {
             default:
                 this.On = false;
         }
-        this.debugLog(`Plug: ${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;
@@ -109,25 +114,32 @@ class Plug {
             default:
                 this.On = false;
         }
-        this.debugLog(`Plug: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
     }
+    /**
+     * Asks the SwitchBot API for the latest device information
+     */
     async refreshStatus() {
-        if (this.device.ble) {
+        if (this.BLE) {
             await this.BLERefreshStatus();
         }
-        else {
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIRefreshStatus();
         }
+        else {
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, refreshStatus will not happen.`);
+        }
     }
     async BLERefreshStatus() {
-        this.debugLog(`Plug: ${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(`Plug: ${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) {
@@ -140,12 +152,8 @@ class Plug {
                 // 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(`Plug: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-                        this.infoLog(`Plug: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
-                    }
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
+                        + ` BLE Address Found: ${this.address}`);
                     this.serviceData = ad.serviceData;
                     this.state = ad.serviceData.state;
                     this.delay = ad.serviceData.delay;
@@ -154,17 +162,17 @@ class Plug {
                     this.wifiRssi = ad.serviceData.wifiRssi;
                     this.overload = ad.serviceData.overload;
                     this.currentPower = ad.serviceData.currentPower;
-                    this.debugLog(`Plug: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                    this.debugLog(`Plug: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(ad.serviceData)}`);
+                    this.debugLog(`${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(`Plug: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                     else {
                         this.connected = false;
-                        this.debugLog(`Plug: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                 };
                 // Wait 2 seconds
@@ -174,71 +182,33 @@ class Plug {
                 // Stop to monitor
                 switchbot.stopScan();
                 if (this.connected) {
-                    this.parseStatus();
+                    this.BLEparseStatus();
                     this.updateHomeKitCharacteristics();
                 }
                 else {
-                    await this.BLEconnection(switchbot);
+                    await this.BLERefreshConnection(switchbot);
                 }
             })
                 .catch(async (e) => {
-                this.errorLog(`Plug: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Plug: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-                }
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`Plug: ${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);
-        }
-    }
-    BLEmodel() {
-        if (this.device.deviceType === 'Plug Mini (US)') {
-            return 'g';
-        }
-        else {
-            return 'j';
-        }
-    }
-    async getCustomBLEAddress(switchbot) {
-        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: this.BLEmodel(),
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`Plug: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await switchbot.wait(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
-        }
-    }
-    async BLEconnection(switchbot) {
-        this.errorLog(`Plug: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
-        if (this.platform.config.credentials?.token) {
-            this.warnLog(`Plug: ${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(`Plug: ${this.accessory.displayName} sign: ${sign}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
             const options = {
                 hostname: settings_1.HostDomain,
                 port: 443,
@@ -253,36 +223,35 @@ class Plug {
                 },
             };
             const req = https_1.default.request(options, (res) => {
-                this.debugLog(`Plug: ${this.accessory.displayName} 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(`Plug: ${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(`Plug: ${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.parseStatus();
+                        this.openAPIparseStatus();
                         this.updateHomeKitCharacteristics();
                     }
                     catch (e) {
-                        this.errorLog(`Plug: ${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(`Plug: ${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(`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Plug: ${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)}`);
         }
     }
     /**
@@ -295,73 +264,63 @@ class Plug {
      * Plug Mini (US/JP)  -    "command"      toggle      default     =        toggle state
      */
     async pushChanges() {
-        if (this.device.ble) {
+        if (this.BLE) {
             await this.BLEpushChanges();
         }
-        else {
+        else if (this.OpenAPI && this.platform.config.credentials?.token) {
             await this.openAPIpushChanges();
         }
-    }
-    async BLEpushChanges() {
-        this.debugLog(`Plug: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
-        this.debugLog(`Plug: ${this.accessory.displayName} BLE pushChanges`);
-        const switchbot = await this.platform.connectBLE();
-        // Convert to BLE Address
-        this.device.bleMac = this.device
-            .deviceId.match(/.{1,2}/g)
-            .join(':')
-            .toLowerCase();
-        this.debugLog(`Plug: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        switchbot
-            .discover({
-            model: this.BLEmodel(),
-            id: this.device.bleMac,
-        })
-            .then((device_list) => {
-            this.infoLog(`Plug: ${this.accessory.displayName} On: ${this.On}`);
-            return this.turnOnOff(device_list);
-        })
-            .then(() => {
-            this.debugLog(`Plug: ${this.accessory.displayName} Done.`);
-            this.On = false;
-            this.OnCached = this.On;
-            this.accessory.context.On = this.OnCached;
-        })
-            .catch(async (e) => {
-            this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
-            if (this.platform.debugMode) {
-                this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-            }
-            if (this.platform.config.credentials?.token) {
-                this.warnLog(`Plug: ${this.accessory.displayName} Using OpenAPI Connection`);
-                await this.openAPIpushChanges();
-            }
-            this.apiError(e);
+        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();
         });
-        this.OnCached = this.On;
-        this.accessory.context.On = this.OnCached;
     }
-    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 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: this.BLEmodel(),
+                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() {
-        if (this.platform.config.credentials?.token) {
-            if (this.On !== this.OnCached) {
+        try {
+            if (this.On !== this.accessory.context.On) {
                 // Make Push On request to the API
-                this.debugLog(`Plug: ${this.accessory.displayName} OpenAPI pushChanges`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
                 const t = Date.now();
                 const nonce = 'requestID';
                 const data = this.platform.config.credentials?.token + t + nonce;
@@ -369,7 +328,7 @@ class Plug {
                     .update(Buffer.from(data, 'utf-8'))
                     .digest();
                 const sign = signTerm.toString('base64');
-                this.debugLog(`Plug: ${this.accessory.displayName} sign: ${sign}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
                 let command = '';
                 if (this.On) {
                     command = 'turnOn';
@@ -377,12 +336,12 @@ class Plug {
                 else {
                     command = 'turnOff';
                 }
-                const body = JSON.stringify({
+                const body = (0, super_stringify_1.default)({
                     'command': `${command}`,
                     'parameter': 'default',
                     'commandType': 'command',
                 });
-                this.infoLog(`Plug: ${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,
@@ -398,126 +357,237 @@ class Plug {
                     },
                 };
                 const req = https_1.default.request(options, res => {
-                    this.debugLog(`Plug: ${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(`Plug: ${this.accessory.displayName} d: ${d}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
                     });
                 });
                 req.on('error', (e) => {
-                    this.errorLog(`Plug: ${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(`Plug: ${this.accessory.displayName} openAPIpushChanges: ${JSON.stringify(req)}`);
-                this.OnCached = this.On;
-                this.accessory.context.On = this.OnCached;
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
             }
-            (0, rxjs_1.interval)(5000)
-                .pipe((0, operators_1.take)(1))
-                .subscribe(async () => {
-                await this.refreshStatus();
-            });
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `On: ${this.On}, `
+                    + `OnCached: ${this.accessory.context.On}`);
+            }
+        }
+        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)}`);
         }
     }
+    /**
+     * 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.doPlugUpdate.next();
+    }
     async updateHomeKitCharacteristics() {
         if (this.On === undefined) {
-            this.debugLog(`Plug: ${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.outletService.updateCharacteristic(this.platform.Characteristic.On, this.On);
-            this.debugLog(`Plug: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
     }
-    async apiError(e) {
-        this.outletService.updateCharacteristic(this.platform.Characteristic.On, e);
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+    BLEmodel() {
+        if (this.device.deviceType === 'Plug Mini (US)') {
+            return 'g';
+        }
+        else {
+            return 'j';
+        }
+    }
+    async getCustomBLEAddress(switchbot) {
+        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+            (async () => {
+                // Start to monitor advertisement packets
+                await switchbot.startScan({
+                    model: this.BLEmodel(),
+                });
+                // 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;
+    }
+    model(device) {
+        let model;
+        if (device.deviceType === 'Plug Mini (US)') {
+            model = 'W1901400';
+        }
+        else if (device.deviceType === 'Plug Mini (JP)') {
+            model = 'W2001400';
+        }
+        else {
+            model = 'SP11';
+        }
+        return model;
+    }
+    async scan(device) {
+        if (device.scanDuration) {
+            this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+            }
+        }
+        else {
+            this.scanDuration = this.accessory.context.scanDuration = 1;
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+            }
+        }
     }
     async statusCode({ res }) {
         switch (res.statusCode) {
             case 151:
-                this.errorLog(`Plug: ${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(`Plug: ${this.accessory.displayName} Device not found.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
                 break;
             case 160:
-                this.errorLog(`Plug: ${this.accessory.displayName} Command is not supported.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
                 break;
             case 161:
-                this.errorLog(`Plug: ${this.accessory.displayName} Device is offline.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
                 this.offlineOff();
                 break;
             case 171:
-                this.errorLog(`Plug: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline. Hub: ${this.device.hubDeviceId}`);
                 this.offlineOff();
                 break;
             case 190:
-                this.errorLog(`Plug: ${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:
-                this.debugLog(`Plug: ${this.accessory.displayName} Command successfully sent.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
                 break;
             default:
-                this.debugLog(`Plug: ${this.accessory.displayName} Unknown statusCode.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
         }
     }
     async offlineOff() {
         if (this.device.offline) {
             this.On = false;
             this.outletService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+            await this.updateHomeKitCharacteristics();
         }
     }
-    /**
-     * Handle requests to set the value of the "On" characteristic
-     */
-    async handleOnSet(value) {
-        this.debugLog(`Plug: ${this.accessory.displayName} - Set On: ${value}`);
-        this.On = value;
-        this.doPlugUpdate.next();
+    async apiError(e) {
+        this.outletService.updateCharacteristic(this.platform.Characteristic.On, e);
     }
-    model(device) {
-        let model;
-        if (device.deviceType === 'Plug Mini (US)') {
-            model = 'W1901400';
+    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.deviceType === 'Plug Mini (JP)') {
-            model = 'W2001400';
+        else if (device.firmware) {
+            FirmwareRevision = device.firmware;
         }
         else {
-            model = 'SP11';
+            FirmwareRevision = this.platform.version;
         }
-        return model;
-    }
-    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 });
-        });
+        return FirmwareRevision;
     }
-    async maxRetry() {
-        let maxRetry;
-        if (this.device.bot?.maxRetry) {
-            maxRetry = this.device.bot?.maxRetry;
+    async context() {
+        if (this.On === undefined) {
+            this.On = false;
         }
         else {
-            maxRetry = 5;
+            this.On = this.accessory.context.On;
+        }
+    }
+    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}`);
         }
-        return maxRetry;
     }
     async config(device) {
         let config = {};
         if (device.plug) {
             config = device.plug;
         }
-        if (device.ble !== undefined) {
-            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;
@@ -532,66 +602,26 @@ class Plug {
             config['offline'] = device.offline;
         }
         if (Object.entries(config).length !== 0) {
-            this.infoLog(`Plug: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-        }
-    }
-    async refreshRate(device) {
-        if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Plug: ${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(`Plug: ${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(`Plug: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
-        }
-        else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.device.ble) {
-                this.debugLog(`Plug: ${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(`Plug: ${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(`Plug: ${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(`Plug: ${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(`Plug: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-        }
-    }
-    FirmwareRevision(accessory, device) {
-        let FirmwareRevision;
-        this.debugLog(`Plug: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`Plug: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`Plug: ${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;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
-        return FirmwareRevision;
     }
     /**
      * Logging for Device
@@ -606,11 +636,25 @@ class Plug {
             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') {