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

package/dist/device/motion.js

@@ -8,6 +8,7 @@ const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const super_stringify_1 = __importDefault(require("super-stringify"));
 const settings_1 = require("../settings");
 /**
  * Platform Accessory
@@ -19,12 +20,15 @@ class Motion {
         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);
-        this.MotionDetected = false;
+        this.context();
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doMotionUpdate = new rxjs_1.Subject();
         this.motionUbpdateInProgress = false;
@@ -53,34 +57,34 @@ class Motion {
         // see https://developers.homebridge.io/#/service/MotionSensor
         // Light Sensor Service
         if (device.motion?.hide_lightsensor) {
-            this.debugLog(`Motion Sensor: ${accessory.displayName} Removing Light Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
             this.lightSensorService = this.accessory.getService(this.platform.Service.LightSensor);
             accessory.removeService(this.lightSensorService);
         }
         else if (!this.lightSensorService) {
-            this.debugLog(`Motion Sensor: ${accessory.displayName} Add Light Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
             (this.lightSensorService =
                 this.accessory.getService(this.platform.Service.LightSensor) || this.accessory.addService(this.platform.Service.LightSensor)),
                 `${accessory.displayName} Light Sensor`;
             this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Light Sensor`);
         }
         else {
-            this.debugLog(`Motion Sensor: ${accessory.displayName} Light Sensor Service Not Added`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Light Sensor Service Not Added`);
         }
         // Battery Service
-        if (!device.ble) {
-            this.debugLog(`Motion Sensor: ${accessory.displayName} Removing Battery Service`);
+        if (!this.BLE) {
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Battery Service`);
             this.batteryService = this.accessory.getService(this.platform.Service.Battery);
             accessory.removeService(this.batteryService);
         }
-        else if (device.ble && !this.batteryService) {
-            this.debugLog(`Motion Sensor: ${accessory.displayName} Add Battery Service`);
+        else if (this.BLE && !this.batteryService) {
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Battery Service`);
             (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || this.accessory.addService(this.platform.Service.Battery)),
                 `${accessory.displayName} Battery`;
             this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
         }
         else {
-            this.debugLog(`Motion Sensor: ${accessory.displayName} Battery Service Not Added`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);
         }
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
@@ -95,18 +99,22 @@ class Motion {
      * 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(`Motion Sensor: ${this.accessory.displayName} BLE parseStatus`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // Movement
         this.MotionDetected = this.movement;
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
         // Light Level
         if (!this.device.motion?.hide_lightsensor) {
             this.set_minLux = this.minLux();
@@ -119,7 +127,7 @@ class Motion {
                 default:
                     this.CurrentAmbientLightLevel = this.set_maxLux;
             }
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
                 ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
         // Battery
@@ -133,46 +141,46 @@ class Motion {
         else {
             this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
+            + ` StatusLowBattery: ${this.StatusLowBattery}`);
     }
     async openAPIparseStatus() {
-        if (this.device.ble) {
-            this.SwitchToOpenAPI = false;
-        }
-        if (this.platform.config.credentials?.token) {
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} OpenAPI parseStatus`);
-            // Motion State
-            this.MotionDetected = this.moveDetected;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
-            // Light Level
-            if (!this.device.motion?.hide_lightsensor) {
-                this.set_minLux = this.minLux();
-                this.set_maxLux = this.maxLux();
-                switch (this.brightness) {
-                    case 'dim':
-                        this.CurrentAmbientLightLevel = this.set_minLux;
-                        break;
-                    case 'bright':
-                    default:
-                        this.CurrentAmbientLightLevel = this.set_maxLux;
-                }
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+        // Motion State
+        this.MotionDetected = this.moveDetected;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+        // Light Level
+        if (!this.device.motion?.hide_lightsensor) {
+            this.set_minLux = this.minLux();
+            this.set_maxLux = this.maxLux();
+            switch (this.brightness) {
+                case 'dim':
+                    this.CurrentAmbientLightLevel = this.set_minLux;
+                    break;
+                case 'bright':
+                default:
+                    this.CurrentAmbientLightLevel = this.set_maxLux;
             }
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
     }
     /**
      * 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(`Motion Sensor: ${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 =
@@ -181,7 +189,7 @@ class Motion {
                     .deviceId.match(/.{1,2}/g)
                     .join(':')
                     .toLowerCase();
-        this.debugLog(`Motion Sensor: ${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) {
@@ -194,26 +202,22 @@ class Motion {
                 // 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(`Motion Sensor: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-                        this.infoLog(`Motion Sensor: ${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.movement = ad.serviceData.movement;
                     this.battery = ad.serviceData.battery;
                     this.lightLevel = ad.serviceData.lightLevel;
-                    this.debugLog(`Motion Sensor: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                    this.debugLog(`Motion Sensor: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, lightLevel: ` +
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${(0, super_stringify_1.default)(ad.serviceData)}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, lightLevel: ` +
                         `${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`);
                     if (this.serviceData) {
                         this.connected = true;
-                        this.debugLog(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                     else {
                         this.connected = false;
-                        this.debugLog(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
                     }
                 };
                 // Wait 10 seconds
@@ -223,113 +227,77 @@ class Motion {
                 // 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(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
-                }
-                if (this.platform.config.credentials?.token) {
-                    this.warnLog(`Motion Sensor: ${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')) {
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: 's',
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`Motion Sensor: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await switchbot.wait(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
-        }
-    }
-    async BLEconnection(switchbot) {
-        this.errorLog(`Motion Sensor: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
-        if (this.platform.config.credentials?.token) {
-            this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
-            this.SwitchToOpenAPI = true;
-            await this.openAPIRefreshStatus();
+            await this.BLERefreshConnection(switchbot);
         }
     }
     async openAPIRefreshStatus() {
-        if (this.platform.config.credentials?.token) {
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} OpenAPI RefreshStatus`);
-            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(`Motion Sensor: ${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(`Motion Sensor: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-                    let rawData = '';
-                    res.on('data', (d) => {
-                        rawData += d;
-                        this.debugLog(`Motion Sensor: ${this.accessory.displayName} d: ${d}`);
-                    });
-                    res.on('end', () => {
-                        try {
-                            this.deviceStatus = JSON.parse(rawData);
-                            this.debugLog(`Motion Sensor: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
-                            this.moveDetected = this.deviceStatus.body.moveDetected;
-                            this.brightness = this.deviceStatus.body.brightness;
-                            this.parseStatus();
-                            this.updateHomeKitCharacteristics();
-                        }
-                        catch (e) {
-                            this.errorLog(`Motion Sensor: ${this.accessory.displayName} error message: ${e.message}`);
-                        }
-                    });
+        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}`);
                 });
-                req.on('error', (e) => {
-                    this.errorLog(`Motion Sensor: ${this.accessory.displayName} error message: ${e.message}`);
+                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.moveDetected = this.deviceStatus.body.moveDetected;
+                        this.brightness = this.deviceStatus.body.brightness;
+                        this.openAPIparseStatus();
+                        this.updateHomeKitCharacteristics();
+                    }
+                    catch (e) {
+                        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
+                    }
                 });
-                req.end();
-            }
-            catch (e) {
-                this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
-                        ` Error Message: ${JSON.stringify(e.message)}`);
-                }
-                this.apiError(e);
-            }
+            });
+            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)}`);
         }
     }
     /**
@@ -337,116 +305,152 @@ class Motion {
      */
     async updateHomeKitCharacteristics() {
         if (this.MotionDetected === undefined) {
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
         }
         else {
+            this.accessory.context.MotionDetected = this.MotionDetected;
             this.motionSensorService.updateCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected);
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`);
         }
-        if (this.device.ble) {
+        if (this.BLE) {
             if (this.BatteryLevel === undefined) {
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
             }
             else {
+                this.accessory.context.BatteryLevel = this.BatteryLevel;
                 this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
             }
             if (this.StatusLowBattery === undefined) {
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
             }
             else {
+                this.accessory.context.StatusLowBattery = this.StatusLowBattery;
                 this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
             }
             if (this.CurrentAmbientLightLevel === undefined) {
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
             else {
+                this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
                 this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName}` + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                    + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
         }
     }
-    async apiError(e) {
-        this.motionSensorService.updateCharacteristic(this.platform.Characteristic.MotionDetected, e);
-        if (this.device.ble) {
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-            this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
+    async getCustomBLEAddress(switchbot) {
+        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
+            (async () => {
+                // Start to monitor advertisement packets
+                await switchbot.startScan({
+                    model: 's',
+                });
+                // 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();
+            })();
         }
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
-    async config(device) {
-        let config = {};
-        if (device.motion) {
-            config = device.motion;
-        }
-        if (device.ble !== undefined) {
-            config['ble'] = device.ble;
-        }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
-        }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
-        }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
+    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();
         }
-        if (device.offline !== undefined) {
-            config['offline'] = device.offline;
+    }
+    minLux() {
+        if (this.device.motion?.set_minLux) {
+            this.set_minLux = this.device.motion.set_minLux;
         }
-        if (Object.entries(config).length !== 0) {
-            this.infoLog(`Motion Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+        else {
+            this.set_minLux = 1;
         }
+        return this.set_minLux;
     }
-    async refreshRate(device) {
-        if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+    maxLux() {
+        if (this.device.motion?.set_maxLux) {
+            this.set_maxLux = this.device.motion.set_maxLux;
         }
-        else if (this.platform.config.options.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+        else {
+            this.set_maxLux = 6001;
         }
+        return this.set_maxLux;
     }
     async scan(device) {
         if (device.scanDuration) {
             this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-            if (device.ble) {
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config scanDuration: ${this.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.device.ble) {
-                this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+            if (this.BLE) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
             }
         }
     }
-    async logs(device) {
-        if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-        }
-        else if (device.logging) {
-            this.deviceLogging = this.accessory.context.logging = device.logging;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+    async statusCode({ res }) {
+        switch (res.statusCode) {
+            case 151:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
+                break;
+            case 152:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
+                break;
+            case 160:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
+                break;
+            case 161:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
+                this.offlineOff();
+                break;
+            case 171:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
+                this.offlineOff();
+                break;
+            case 190:
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
+                    ` Or command: ${(0, super_stringify_1.default)(res)} format is invalid`);
+                break;
+            case 100:
+                if (this.platform.debugMode) {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
+                }
+                break;
+            default:
+                if (this.platform.debugMode) {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
+                }
         }
-        else if (this.platform.config.options?.logging) {
-            this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
+    }
+    async offlineOff() {
+        if (this.device.offline) {
+            this.MotionDetected = false;
+            this.motionSensorService.getCharacteristic(this.platform.Characteristic.MotionDetected).updateValue(this.MotionDetected);
+            await this.updateHomeKitCharacteristics();
         }
-        else {
-            this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`Motion Sensor: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+    }
+    async apiError(e) {
+        this.motionSensorService.updateCharacteristic(this.platform.Characteristic.MotionDetected, e);
+        if (this.BLE) {
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
+            this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
         }
     }
     FirmwareRevision(accessory, device) {
         let FirmwareRevision;
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`Motion Sensor: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
+        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;
         }
@@ -458,23 +462,68 @@ class Motion {
         }
         return FirmwareRevision;
     }
-    minLux() {
-        if (this.device.motion?.set_minLux) {
-            this.set_minLux = this.device.motion.set_minLux;
+    async context() {
+        if (this.MotionDetected === undefined) {
+            this.MotionDetected = false;
         }
         else {
-            this.set_minLux = 1;
+            this.MotionDetected = this.accessory.context.MotionDetected;
         }
-        return this.set_minLux;
     }
-    maxLux() {
-        if (this.device.motion?.set_maxLux) {
-            this.set_maxLux = this.device.motion.set_maxLux;
+    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.motion) {
+            config = device.motion;
+        }
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
+        }
+        if (device.external !== undefined) {
+            config['external'] = device.external;
+        }
+        if (device.logging !== undefined) {
+            config['logging'] = device.logging;
+        }
+        if (device.refreshRate !== undefined) {
+            config['refreshRate'] = device.refreshRate;
+        }
+        if (device.scanDuration !== undefined) {
+            config['scanDuration'] = device.scanDuration;
+        }
+        if (device.offline !== undefined) {
+            config['offline'] = device.offline;
+        }
+        if (Object.entries(config).length !== 0) {
+            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(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+        }
+        else if (device.logging) {
+            this.deviceLogging = this.accessory.context.logging = device.logging;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+        }
+        else if (this.platform.config.options?.logging) {
+            this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
         }
         else {
-            this.set_maxLux = 6001;
+            this.deviceLogging = this.accessory.context.logging = 'standard';
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
-        return this.set_maxLux;
     }
     /**
      * Logging for Device
@@ -489,11 +538,25 @@ class Motion {
             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') {