@switchbot/homebridge-switchbot 2.0.0-beta.3 → 2.0.0-beta.30

package/dist/device/lock.js

@@ -7,6 +7,7 @@ exports.Lock = 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 Lock {
@@ -14,17 +15,15 @@ class Lock {
         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.LockTargetState === undefined) {
-            this.LockTargetState = false;
-        }
-        else {
-            this.LockTargetState = this.accessory.context.On;
-        }
+        this.conext();
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doLockUpdate = new rxjs_1.Subject();
         this.lockUpdateInProgress = false;
@@ -55,19 +54,19 @@ class Lock {
         this.lockService.getCharacteristic(this.platform.Characteristic.LockTargetState).onSet(this.LockTargetStateSet.bind(this));
         // Contact Sensor Service
         if (device.lock?.hide_contactsensor) {
-            this.debugLog(`Lock: ${accessory.displayName} Removing Contact Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Contact Sensor Service`);
             this.contactSensorService = this.accessory.getService(this.platform.Service.ContactSensor);
             accessory.removeService(this.contactSensorService);
         }
         else if (!this.contactSensorService) {
-            this.debugLog(`Lock: ${accessory.displayName} Add Contact Sensor Service`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Contact Sensor Service`);
             (this.contactSensorService =
                 this.accessory.getService(this.platform.Service.ContactSensor) || this.accessory.addService(this.platform.Service.ContactSensor)),
                 `${accessory.displayName} Contact Sensor`;
             this.contactSensorService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Contact Sensor`);
         }
         else {
-            this.debugLog(`Lock: ${accessory.displayName} Contact Sensor Service Not Added`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Contact Sensor Service Not Added`);
         }
         // Update Homekit
         this.updateHomeKitCharacteristics();
@@ -88,17 +87,29 @@ class Lock {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges`);
-                if (this.deviceLogging.includes('debug')) {
-                    this.errorLog(`Lock: ${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.lockUpdateInProgress = false;
         });
     }
-    //{"deviceId":"DBDC23B53139","deviceType":"Smart Lock","hubDeviceId":"E68B14109DA2","lockState":"locked","doorState":"opened","calibrate":true}
+    /**
+     * Parse the device status from the SwitchBot api
+     */
     async parseStatus() {
+        /*if (this.BLE) {
+          await this.BLEparseStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            await this.openAPIparseStatus();
+        }
+        else {
+            this.debugWarnLog(`${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} BLEparseStatus`);
         switch (this.lockState) {
             case 'locked':
                 this.LockCurrentState = this.platform.Characteristic.LockCurrentState.SECURED;
@@ -115,16 +126,52 @@ class Lock {
             default:
                 this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
         }
-        this.debugLog(`Lock: ${this.accessory.displayName} On: ${this.LockTargetState}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LockTargetState}`);
     }
+    //{"deviceId":"DBDC23B53139","deviceType":"Smart Lock","hubDeviceId":"E68B14109DA2","lockState":"locked","doorState":"opened","calibrate":true}
+    async openAPIparseStatus() {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+        switch (this.lockState) {
+            case 'locked':
+                this.LockCurrentState = this.platform.Characteristic.LockCurrentState.SECURED;
+                this.LockTargetState = this.platform.Characteristic.LockTargetState.SECURED;
+                break;
+            default:
+                this.LockCurrentState = this.platform.Characteristic.LockCurrentState.UNSECURED;
+                this.LockTargetState = this.platform.Characteristic.LockTargetState.UNSECURED;
+        }
+        switch (this.doorState) {
+            case 'opened':
+                this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
+                break;
+            default:
+                this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
+        }
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LockTargetState}`);
+    }
+    /**
+     * Asks the SwitchBot API for the latest device information
+     */
     async refreshStatus() {
+        /*if (this.BLE) {
+          await this.BLERefreshStatus();
+        } 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 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(`Lock: ${this.accessory.displayName} sign: ${sign}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
             const options = {
                 hostname: settings_1.HostDomain,
                 port: 443,
@@ -139,37 +186,35 @@ class Lock {
                 },
             };
             const req = https_1.default.request(options, (res) => {
-                this.debugLog(`Lock: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus statusCode: ${res.statusCode}`);
                 let rawData = '';
                 res.on('data', (d) => {
                     rawData += d;
-                    this.debugLog(`Lock: ${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(`Lock: ${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.lockState = this.deviceStatus.body.lockState;
                         this.doorState = this.deviceStatus.body.doorState;
-                        this.parseStatus();
+                        this.openAPIparseStatus();
                         this.updateHomeKitCharacteristics();
                     }
                     catch (e) {
-                        this.errorLog(`Lock: ${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(`Lock: ${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(`Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-            if (this.deviceLogging.includes('debug')) {
-                this.errorLog(`Lock: ${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)}`);
         }
     }
     /**
@@ -179,210 +224,305 @@ class Lock {
      * Lock   -    "command"     "unlock"   "default"	 =        set to ???? state - LockCurrentState
      */
     async pushChanges() {
-        // 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(`Lock: ${this.accessory.displayName} sign: ${sign}`);
-        let command = '';
-        if (this.LockTargetState) {
-            command = 'lock';
+        /*if (this.BLE) {
+          await this.BLERefreshStatus();
+        } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+            await this.openAPIpushChanges();
         }
         else {
-            command = 'unlock';
+            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
+                + ` ${this.device.connectionType}, pushChanges will not happen.`);
         }
-        const body = JSON.stringify({
-            'command': `${command}`,
-            'parameter': 'default',
-            'commandType': 'command',
-        });
-        this.infoLog(`Lock: ${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(`Lock: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
-            this.statusCode({ res });
-            res.on('data', d => {
-                this.debugLog(`Lock: ${this.accessory.displayName} d: ${d}`);
-            });
-        });
-        req.on('error', (e) => {
-            this.errorLog(`Lock: ${this.accessory.displayName} error message: ${e.message}`);
-        });
-        req.write(body);
-        req.end();
-        this.debugLog(`Lock: ${this.accessory.displayName} pushchanges: ${JSON.stringify(req)}`);
-        this.accessory.context.On = this.LockTargetState;
         (0, rxjs_1.interval)(5000)
             .pipe((0, operators_1.take)(1))
             .subscribe(async () => {
             await this.refreshStatus();
         });
     }
+    async BLEpushChanges() {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
+        if (this.LockTargetState !== this.accessory.context.LockTargetState) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges LockTargetState: ${this.LockTargetState}`
+                + ` LockTargetStateCached: ${this.accessory.context.LockTargetState}`);
+            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: '',
+                id: this.device.bleMac,
+            })
+                .then(() => {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+                this.LockTargetState = this.platform.Characteristic.LockTargetState.SECURED;
+            })
+                .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.` + `LockTargetState: ${this.LockTargetState}, `
+                + `LockTargetStateCached: ${this.accessory.context.LockTargetState}`);
+        }
+    }
+    async openAPIpushChanges() {
+        try {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
+            if (this.LockTargetState !== this.accessory.context.LockTargetState) {
+                // 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.LockTargetState) {
+                    command = 'lock';
+                }
+                else {
+                    command = 'unlock';
+                }
+                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} openAPIpushChanges 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} openAPIpushChanges: ${(0, super_stringify_1.default)(req)}`);
+            }
+            else {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` + `LockTargetState: ${this.LockTargetState}, `
+                    + `LockTargetStateCached: ${this.accessory.context.LockTargetState}`);
+            }
+        }
+        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 LockTargetStateSet(value) {
+        if (this.LockTargetState === this.accessory.context.LockTargetState) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set LockTargetState: ${value}`);
+        }
+        else {
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
+        }
+        this.LockTargetState = value;
+        this.doLockUpdate.next();
+    }
     async updateHomeKitCharacteristics() {
         if (!this.device.lock?.hide_contactsensor) {
             if (this.ContactSensorState === undefined) {
-                this.debugLog(`Lock: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
             }
             else {
+                this.accessory.context.ContactSensorState = this.ContactSensorState;
                 this.contactSensorService?.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.ContactSensorState);
-                this.debugLog(`Lock: ${this.accessory.displayName} updateCharacteristic ContactSensorState: ${this.ContactSensorState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ContactSensorState: ${this.ContactSensorState}`);
             }
         }
         if (this.LockTargetState === undefined) {
-            this.debugLog(`Lock: ${this.accessory.displayName} LockTargetState: ${this.LockTargetState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockTargetState: ${this.LockTargetState}`);
         }
         else {
+            this.accessory.context.LockTargetState = this.LockTargetState;
             this.lockService.updateCharacteristic(this.platform.Characteristic.LockTargetState, this.LockTargetState);
-            this.debugLog(`Lock: ${this.accessory.displayName} updateCharacteristic LockTargetState: ${this.LockTargetState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic LockTargetState: ${this.LockTargetState}`);
         }
         if (this.LockCurrentState === undefined) {
-            this.debugLog(`Lock: ${this.accessory.displayName} LockCurrentState: ${this.LockCurrentState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockCurrentState: ${this.LockCurrentState}`);
         }
         else {
+            this.accessory.context.LockCurrentState = this.LockCurrentState;
             this.lockService.updateCharacteristic(this.platform.Characteristic.LockCurrentState, this.LockCurrentState);
-            this.debugLog(`Lock: ${this.accessory.displayName} updateCharacteristic LockCurrentState: ${this.LockCurrentState}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic LockCurrentState: ${this.LockCurrentState}`);
         }
     }
-    async apiError(e) {
-        if (!this.device.lock?.hide_contactsensor) {
-            this.contactSensorService?.updateCharacteristic(this.platform.Characteristic.ContactSensorState, e);
+    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 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}`);
+            }
         }
-        this.lockService.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
-        this.lockService.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
     async statusCode({ res }) {
         switch (res.statusCode) {
             case 151:
-                this.errorLog(`Lock: ${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(`Lock: ${this.accessory.displayName} Device not found.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
                 break;
             case 160:
-                this.errorLog(`Lock: ${this.accessory.displayName} Command is not supported.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
                 break;
             case 161:
-                this.errorLog(`Lock: ${this.accessory.displayName} Device is offline.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
+                this.offlineOff();
                 break;
             case 171:
-                this.errorLog(`Lock: ${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(`Lock: ${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(`Lock: ${this.accessory.displayName} Command successfully sent.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
                 break;
             default:
-                this.debugLog(`Lock: ${this.accessory.displayName} Unknown statusCode.`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
         }
     }
-    /**
-     * Handle requests to set the value of the "On" characteristic
-     */
-    async LockTargetStateSet(value) {
-        this.debugLog(`Lock: ${this.accessory.displayName} Set LockTargetState: ${value}`);
-        this.LockTargetState = value;
-        this.doLockUpdate.next();
+    async offlineOff() {
+        if (this.device.offline) {
+            this.LockCurrentState = this.platform.Characteristic.LockCurrentState.SECURED;
+            this.lockService.getCharacteristic(this.platform.Characteristic.LockCurrentState).updateValue(this.LockCurrentState);
+            await this.updateHomeKitCharacteristics();
+        }
     }
-    async config(device) {
-        let config = {};
-        if (device.lock) {
-            config = device.lock;
+    async apiError(e) {
+        if (!this.device.lock?.hide_contactsensor) {
+            this.contactSensorService?.updateCharacteristic(this.platform.Characteristic.ContactSensorState, e);
         }
-        if (device.ble !== undefined) {
-            config['ble'] = device.ble;
+        this.lockService.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
+        this.lockService.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
+    }
+    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;
         }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
+        else if (device.firmware) {
+            FirmwareRevision = device.firmware;
         }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
+        else {
+            FirmwareRevision = this.platform.version;
         }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
+        return FirmwareRevision;
+    }
+    conext() {
+        if (this.LockTargetState === undefined) {
+            this.LockTargetState = false;
         }
-        if (Object.entries(config).length !== 0) {
-            this.infoLog(`Lock: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+        else {
+            this.LockTargetState = this.accessory.context.On;
         }
     }
     async refreshRate(device) {
         if (device.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Lock: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+            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(`Lock: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+            this.debugLog(`${this.device.deviceType}: ${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(`Lock: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
+    async config(device) {
+        let config = {};
+        if (device.lock) {
+            config = device.lock;
         }
-        else {
-            this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.device.ble) {
-                this.debugLog(`Lock: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
+        if (device.connectionType !== undefined) {
+            config['connectionType'] = device.connectionType;
+        }
+        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 (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(`Lock: ${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(`Lock: ${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(`Lock: ${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(`Lock: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
-    FirmwareRevision(accessory, device) {
-        let FirmwareRevision;
-        this.debugLog(`Lock: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-        this.debugLog(`Lock: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-        this.debugLog(`Lock: ${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;
-    }
     /**
      * Logging for Device
      */
@@ -396,11 +536,25 @@ class Lock {
             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') {