@switchbot/homebridge-switchbot 1.6.4-beta.1 → 1.6.4-beta.5

package/CHANGELOG.md

@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file. This projec
 ## [Beta - Version 1.7.0](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.7.0) (2022-01-XX)
 
 ## What's Changed
-* Added option to display Bot a Garage Door Opener? [#179](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/179)
+* Added option to display Bot a Garage Door Opener.  [#179](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/179)
+* Added option to display Bot a Door. [#179](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/179)
+* Added option to display Bot a Lock. [#179](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/179)
 
 **Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.6.3...v1.7.0
 

package/config.schema.json

@@ -194,6 +194,12 @@
                             "door"
                           ]
                         },
+                        {
+                          "title": "Lock",
+                          "enum": [
+                            "lock"
+                          ]
+                        },
                         {
                           "title": "Switch",
                           "enum": [

package/dist/devices/bots.d.ts

@@ -13,6 +13,7 @@ export declare class Bot {
     device: device & devicesConfig;
     private switchService?;
     private doorService?;
+    private lockService?;
     private garageDoorService?;
     private outletService?;
     private batteryService?;
@@ -38,6 +39,7 @@ export declare class Bot {
     private removeOutletService;
     private removeGarageDoorService;
     private removeDoorService;
+    private removeLockService;
     private removeSwitchService;
     refreshRate(): void;
     scan(): void;
@@ -53,9 +55,8 @@ export declare class Bot {
      * Asks the SwitchBot API for the latest device information
      */
     refreshStatus(): Promise<void>;
-    private connectBLE;
+    connectBLE(): Promise<any>;
     private BLERefreshStatus;
-    private BLEconnection;
     private openAPIRefreshStatus;
     /**
      * Pushes the requested changes to the SwitchBot API

package/dist/devices/bots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bots.d.ts","sourceRoot":"","sources":["../../src/devices/bots.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,OAAO,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAa,MAAM,EAAE,aAAa,EAAE,WAAW,EAAM,SAAS,EAAE,oBAAoB,EAAW,MAAM,aAAa,CAAC;AAE1H;;;;GAIG;AACH,qBAAa,GAAG;IAwCZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IAxCvC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,OAAO,CAAC,cAAc,CAAC,CAAU;IAIjC,EAAE,EAAG,mBAAmB,CAAC;IACzB,QAAQ,EAAG,mBAAmB,CAAC;IAC/B,YAAY,EAAG,mBAAmB,CAAC;IACnC,gBAAgB,EAAG,mBAAmB,CAAC;IAGvC,YAAY,EAAG,oBAAoB,CAAC;IAGpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAG,SAAS,CAAC;IACtB,WAAW,EAAG,WAAW,CAAC;IAC1B,IAAI,EAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,KAAK,EAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,OAAO,EAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAGjC,OAAO,EAAG,MAAM,CAAC;IACjB,YAAY,EAAG,MAAM,CAAC;IACtB,aAAa,EAAG,MAAM,CAAC;IACvB,iBAAiB,EAAG,MAAM,CAAC;IAG3B,WAAW,EAAG,MAAM,CAAC;IAGrB,mBAAmB,EAAG,OAAO,CAAC;IAC9B,WAAW,EAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAGT,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,GAAG,aAAa;IA0JvC,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,mBAAmB;IAS3B,WAAW;IAcX,IAAI;IAcJ,IAAI;IAmBJ,aAAa;IAgBb;;OAEG;IACG,WAAW;YAQH,cAAc;YA6Bd,kBAAkB;IAsBhC;;OAEG;IACG,aAAa;IAQnB,OAAO,CAAC,UAAU;YAQJ,gBAAgB;YA6DhB,aAAa;YAQb,oBAAoB;IAuBlC;;;;;;OAMG;IACG,WAAW;YAcH,cAAc;IAgF5B,OAAO,CAAC,SAAS;YAQH,kBAAkB;IAmDhC;;OAEG;IACH,4BAA4B;IAoErB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAatB,OAAO,CAAC,UAAU;IA+BlB,OAAO,CAAC,UAAU;IAWlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAsBnB;;KAEC;IACD,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAMrB,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAMrB,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAMtB,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAUtB,qBAAqB,IAAI,OAAO;CAGjC"}
+{"version":3,"file":"bots.d.ts","sourceRoot":"","sources":["../../src/devices/bots.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,OAAO,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAa,MAAM,EAAE,aAAa,EAAE,WAAW,EAAM,SAAS,EAAE,oBAAoB,EAAW,MAAM,aAAa,CAAC;AAE1H;;;;GAIG;AACH,qBAAa,GAAG;IAyCZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IAzCvC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,OAAO,CAAC,cAAc,CAAC,CAAU;IAIjC,EAAE,EAAG,mBAAmB,CAAC;IACzB,QAAQ,EAAG,mBAAmB,CAAC;IAC/B,YAAY,EAAG,mBAAmB,CAAC;IACnC,gBAAgB,EAAG,mBAAmB,CAAC;IAGvC,YAAY,EAAG,oBAAoB,CAAC;IAGpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAG,SAAS,CAAC;IACtB,WAAW,EAAG,WAAW,CAAC;IAC1B,IAAI,EAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,KAAK,EAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,OAAO,EAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAGjC,OAAO,EAAG,MAAM,CAAC;IACjB,YAAY,EAAG,MAAM,CAAC;IACtB,aAAa,EAAG,MAAM,CAAC;IACvB,iBAAiB,EAAG,MAAM,CAAC;IAG3B,WAAW,EAAG,MAAM,CAAC;IAGrB,mBAAmB,EAAG,OAAO,CAAC;IAC9B,WAAW,EAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAGT,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,GAAG,aAAa;IA4KvC,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,mBAAmB;IAS3B,WAAW;IAcX,IAAI;IAcJ,IAAI;IAmBJ,aAAa;IAgBb;;OAEG;IACG,WAAW;YAQH,cAAc;YA6Bd,kBAAkB;IAsBhC;;OAEG;IACG,aAAa;IAQN,UAAU;YAwBT,gBAAgB;YAgEhB,oBAAoB;IAuBlC;;;;;;OAMG;IACG,WAAW;YAcH,cAAc;IAiF5B,OAAO,CAAC,SAAS;YAQH,kBAAkB;IAmDhC;;OAEG;IACH,4BAA4B;IAyFrB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAwBtB,OAAO,CAAC,UAAU;IA+BlB,OAAO,CAAC,UAAU;IAWlB;;OAEG;IACH,OAAO,CAAC,WAAW;IA6BnB;;KAEC;IACD,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAMrB,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAMrB,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAMtB,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE;IAUtB,qBAAqB,IAAI,OAAO;CAGjC"}

package/dist/devices/bots.js

@@ -52,6 +52,7 @@ class Bot {
         // get the LightBulb service if it exists, otherwise create a new LightBulb service
         // you can create multiple services for each accessory
         if (device.bot?.deviceType === 'switch') {
+            this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
             this.removeGarageDoorService(accessory);
@@ -64,6 +65,7 @@ class Bot {
             this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
         }
         else if (device.bot?.deviceType === 'garagedoor') {
+            this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeOutletService(accessory);
             this.removeSwitchService(accessory);
@@ -77,6 +79,7 @@ class Bot {
             this.garageDoorService.setCharacteristic(this.platform.Characteristic.ObstructionDetected, false);
         }
         else if (device.bot?.deviceType === 'door') {
+            this.removeLockService(accessory);
             this.removeOutletService(accessory);
             this.removeSwitchService(accessory);
             this.removeGarageDoorService(accessory);
@@ -84,7 +87,7 @@ class Bot {
             (this.doorService =
                 accessory.getService(this.platform.Service.Door) ||
                     accessory.addService(this.platform.Service.Door)), `${accessory.displayName} Door`;
-            this.infoLog(`Bot: ${accessory.displayName} Displaying as Garage Door Opener`);
+            this.infoLog(`Bot: ${accessory.displayName} Displaying as Door`);
             this.doorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
             this.doorService.getCharacteristic(this.platform.Characteristic.TargetPosition)
                 .setProps({
@@ -95,7 +98,21 @@ class Bot {
             }).onSet(this.handleOnSet.bind(this));
             this.doorService.setCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
         }
+        else if (device.bot?.deviceType === 'lock') {
+            this.removeDoorService(accessory);
+            this.removeOutletService(accessory);
+            this.removeSwitchService(accessory);
+            this.removeGarageDoorService(accessory);
+            // Add switchService
+            (this.lockService =
+                accessory.getService(this.platform.Service.LockMechanism) ||
+                    accessory.addService(this.platform.Service.LockMechanism)), `${accessory.displayName} Lock`;
+            this.infoLog(`Bot: ${accessory.displayName} Displaying as Lock`);
+            this.lockService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+            this.lockService.getCharacteristic(this.platform.Characteristic.LockTargetState).onSet(this.handleOnSet.bind(this));
+        }
         else {
+            this.removeLockService(accessory);
             this.removeDoorService(accessory);
             this.removeSwitchService(accessory);
             this.removeGarageDoorService(accessory);
@@ -151,34 +168,42 @@ class Bot {
     }
     removeOutletService(accessory) {
         // If outletService still pressent, then remove first
+        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
         if (this.outletService) {
-            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover outletService first`);
+            this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Outlet Service`);
         }
-        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
         accessory.removeService(this.outletService);
     }
     removeGarageDoorService(accessory) {
         // If garageDoorService still pressent, then remove first
+        this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
         if (this.garageDoorService) {
-            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover garageDoorService first`);
+            this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Garage Door Service`);
         }
-        this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
         accessory.removeService(this.garageDoorService);
     }
     removeDoorService(accessory) {
         // If doorService still pressent, then remove first
+        this.doorService = this.accessory.getService(this.platform.Service.Door);
         if (this.doorService) {
-            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover doorService first`);
+            this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Door Service`);
         }
-        this.doorService = this.accessory.getService(this.platform.Service.Door);
         accessory.removeService(this.doorService);
     }
+    removeLockService(accessory) {
+        // If lockService still pressent, then remove first
+        this.lockService = this.accessory.getService(this.platform.Service.LockMechanism);
+        if (this.lockService) {
+            this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Lock Service`);
+        }
+        accessory.removeService(this.lockService);
+    }
     removeSwitchService(accessory) {
         // If switchService still pressent, then remove first
+        this.switchService = this.accessory.getService(this.platform.Service.Switch);
         if (this.switchService) {
-            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover switchService first`);
+            this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Switch Service`);
         }
-        this.switchService = this.accessory.getService(this.platform.Service.Switch);
         accessory.removeService(this.switchService);
     }
     refreshRate() {
@@ -322,80 +347,92 @@ class Bot {
             await this.openAPIRefreshStatus();
         }
     }
-    connectBLE() {
-        // Convert to BLE Address
-        this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
-        this.debugLog(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        const switchbot = this.platform.connectBLE();
+    async connectBLE() {
+        let switchbot;
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const Switchbot = require('node-switchbot');
+            switchbot = new Switchbot();
+            // Convert to BLE Address
+            this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
+            this.debugLog(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+        }
+        catch (e) {
+            switchbot = false;
+            this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot}`);
+            if (this.deviceLogging === 'debug') {
+                this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
+                    + ` Error Message: ${JSON.stringify(e.message)}`);
+            }
+            if (this.platform.debugMode) {
+                this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
+                    + ` Error: ${JSON.stringify(e)}`);
+            }
+        }
         return switchbot;
     }
     async BLERefreshStatus() {
         this.debugLog(`Bot: ${this.accessory.displayName} BLE refreshStatus`);
         // Convert to BLE Address
-        const switchbot = this.connectBLE();
+        const switchbot = await this.connectBLE();
         // Start to monitor advertisement packets
-        if (switchbot !== false) {
-            switchbot.startScan({
-                model: 'H',
-                id: this.device.bleMac,
-            }).then(() => {
-                // Set an event hander
-                switchbot.onadvertisement = (ad) => {
-                    this.serviceData = ad.serviceData;
-                    this.mode = ad.serviceData.mode;
-                    this.state = ad.serviceData.state;
-                    this.battery = ad.serviceData.battery;
-                    this.debugLog(`Bot: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                    this.debugLog(`Bot: ${this.accessory.displayName}, model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName},`
-                        + ` mode: ${ad.serviceData.mode}, state: ${ad.serviceData.state}, battery: ${ad.serviceData.battery}`);
-                    if (this.serviceData) {
-                        this.connected = true;
-                        this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
-                    }
-                    else {
-                        this.connected = false;
-                        this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
-                    }
-                };
-                // Wait 2 seconds
-                return switchbot.wait(this.scanDuration * 1000);
-            }).then(async () => {
-                // Stop to monitor
-                switchbot.stopScan();
-                if (this.connected) {
-                    this.parseStatus();
-                    this.updateHomeKitCharacteristics();
+        if (switchbot === false) {
+            this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
+        }
+        switchbot.startScan({
+            model: 'H',
+            id: this.device.bleMac,
+        }).then(() => {
+            // Set an event hander
+            switchbot.onadvertisement = (ad) => {
+                this.serviceData = ad.serviceData;
+                this.mode = ad.serviceData.mode;
+                this.state = ad.serviceData.state;
+                this.battery = ad.serviceData.battery;
+                this.debugLog(`Bot: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+                this.debugLog(`Bot: ${this.accessory.displayName}, model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName},`
+                    + ` mode: ${ad.serviceData.mode}, state: ${ad.serviceData.state}, battery: ${ad.serviceData.battery}`);
+                if (this.serviceData) {
+                    this.connected = true;
+                    this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
                 }
                 else {
-                    await this.BLEconnection();
-                }
-            }).catch(async (e) => {
-                this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-                if (this.deviceLogging === 'debug') {
-                    this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-                        + ` Error Message: ${JSON.stringify(e.message)}`);
-                }
-                if (this.platform.debugMode) {
-                    this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
-                        + ` Error: ${JSON.stringify(e)}`);
+                    this.connected = false;
+                    this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
                 }
+            };
+            // Wait 2 seconds
+            return switchbot.wait(this.scanDuration * 1000);
+        }).then(async () => {
+            // Stop to monitor
+            switchbot.stopScan();
+            if (this.connected) {
+                this.parseStatus();
+                this.updateHomeKitCharacteristics();
+            }
+            else {
+                this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
                 if (this.platform.config.credentials?.openToken) {
                     this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
                     await this.openAPIRefreshStatus();
                 }
-                this.apiError(e);
-            });
-        }
-        else {
-            await this.BLEconnection();
-        }
-    }
-    async BLEconnection() {
-        this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-        if (this.platform.config.credentials?.openToken) {
-            this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-            await this.openAPIRefreshStatus();
-        }
+            }
+        }).catch(async (e) => {
+            this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
+            if (this.deviceLogging === 'debug') {
+                this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+                    + ` Error Message: ${JSON.stringify(e.message)}`);
+            }
+            if (this.platform.debugMode) {
+                this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+                    + ` Error: ${JSON.stringify(e)}`);
+            }
+            if (this.platform.config.credentials?.openToken) {
+                this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                await this.openAPIRefreshStatus();
+            }
+            this.apiError(e);
+        });
     }
     async openAPIRefreshStatus() {
         if (this.platform.config.credentials?.openToken) {
@@ -442,84 +479,84 @@ class Bot {
         });
     }
     async BLEpushChanges() {
+        this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
         if (this.On !== this.OnCached) {
             this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
-            const switchbot = this.connectBLE();
-            if (switchbot !== false) {
-                if (this.botMode === 'press') {
-                    this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
-                    switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac })
-                        .then((device_list) => {
-                        this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
-                        return device_list[0].press({ id: this.device.bleMac });
-                    }).then(() => {
-                        this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
-                        this.On = false;
-                        this.OnCached = this.On;
-                        this.accessory.context.On = this.OnCached;
-                        setTimeout(() => {
-                            if (this.device.bot?.deviceType === 'switch') {
-                                this.switchService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
-                            }
-                            else {
-                                this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
-                            }
-                            this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
-                        }, 500);
-                    }).catch(async (e) => {
-                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                        if (this.deviceLogging === 'debug') {
-                            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                                + ` Error Message: ${JSON.stringify(e.message)}`);
-                        }
-                        if (this.platform.debugMode) {
-                            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                                + ` Error: ${JSON.stringify(e)}`);
-                        }
-                        if (this.platform.config.credentials?.openToken) {
-                            this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-                            await this.openAPIpushChanges();
-                        }
-                        this.apiError(e);
-                    });
-                }
-                else if (this.botMode === 'switch') {
-                    this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
-                    switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list) => {
-                        this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
-                        return this.turnOnOff(device_list);
-                    }).then(() => {
-                        this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
-                        this.OnCached = this.On;
-                        this.accessory.context.On = this.OnCached;
-                    }).catch(async (e) => {
-                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-                        if (this.deviceLogging === 'debug') {
-                            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                                + ` Error Message: ${JSON.stringify(e.message)}`);
-                        }
-                        if (this.platform.debugMode) {
-                            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-                                + ` Error: ${JSON.stringify(e)}`);
+            const switchbot = await this.connectBLE();
+            //if (switchbot !== false) {
+            if (this.botMode === 'press') {
+                this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+                switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac })
+                    .then((device_list) => {
+                    this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+                    return device_list[0].press({ id: this.device.bleMac });
+                }).then(() => {
+                    this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+                    this.On = false;
+                    this.OnCached = this.On;
+                    this.accessory.context.On = this.OnCached;
+                    setTimeout(() => {
+                        if (this.device.bot?.deviceType === 'switch') {
+                            this.switchService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
                         }
-                        if (this.platform.config.credentials?.openToken) {
-                            this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-                            await this.openAPIpushChanges();
+                        else {
+                            this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
                         }
-                        this.apiError(e);
-                    });
-                }
-                else {
-                    throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
-                }
+                        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
+                    }, 500);
+                }).catch(async (e) => {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+                    if (this.deviceLogging === 'debug') {
+                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                            + ` Error Message: ${JSON.stringify(e.message)}`);
+                    }
+                    if (this.platform.debugMode) {
+                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                            + ` Error: ${JSON.stringify(e)}`);
+                    }
+                    if (this.platform.config.credentials?.openToken) {
+                        this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                        await this.openAPIpushChanges();
+                    }
+                    this.apiError(e);
+                });
+            }
+            else if (this.botMode === 'switch') {
+                this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
+                switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list) => {
+                    this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+                    return this.turnOnOff(device_list);
+                }).then(() => {
+                    this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+                    this.OnCached = this.On;
+                    this.accessory.context.On = this.OnCached;
+                }).catch(async (e) => {
+                    this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+                    if (this.deviceLogging === 'debug') {
+                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                            + ` Error Message: ${JSON.stringify(e.message)}`);
+                    }
+                    if (this.platform.debugMode) {
+                        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                            + ` Error: ${JSON.stringify(e)}`);
+                    }
+                    if (this.platform.config.credentials?.openToken) {
+                        this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                        await this.openAPIpushChanges();
+                    }
+                    this.apiError(e);
+                });
             }
             else {
-                this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-                if (this.platform.config.credentials?.openToken) {
-                    this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-                    await this.openAPIpushChanges();
-                }
+                throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
             }
+            /* } else {
+               this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+               if (this.platform.config.credentials?.openToken) {
+                 this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                 await this.openAPIpushChanges();
+               }
+             }*/
         }
         this.OnCached = this.On;
         this.accessory.context.On = this.OnCached;
@@ -603,7 +640,7 @@ class Bot {
                     this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
                 }
             }
-            this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            this.debugLog(`Bot: ${this.accessory.displayName} Garage Door On: ${this.On}`);
         }
         else if (this.device.bot?.deviceType === 'door') {
             if (this.On === undefined) {
@@ -611,17 +648,37 @@ class Bot {
             }
             else {
                 if (this.On) {
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
+                    this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
+                    this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
+                    this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
                     this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
                 }
                 else {
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
-                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
+                    this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
+                    this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
+                    this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
                     this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
                 }
             }
-            this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            this.debugLog(`Bot: ${this.accessory.displayName} Door On: ${this.On}`);
+        }
+        else if (this.device.bot?.deviceType === 'lock') {
+            if (this.On === undefined) {
+                this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+            }
+            else {
+                if (this.On) {
+                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, this.platform.Characteristic.LockTargetState.UNSECURED);
+                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, this.platform.Characteristic.LockCurrentState.UNSECURED);
+                    this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic LockTargetState: UNSECURED, LockCurrentState: UNSECURED`);
+                }
+                else {
+                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, this.platform.Characteristic.LockTargetState.SECURED);
+                    this.lockService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, this.platform.Characteristic.LockCurrentState.SECURED);
+                    this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic LockTargetState: SECURED, LockCurrentState: SECURED`);
+                }
+            }
+            this.debugLog(`Bot: ${this.accessory.displayName} Lock On: ${this.On}`);
         }
         else if (this.device.bot?.deviceType === 'switch') {
             if (this.On === undefined) {
@@ -659,7 +716,21 @@ class Bot {
         }
     }
     apiError(e) {
-        if (this.device.bot?.deviceType === 'switch') {
+        if (this.device.bot?.deviceType === 'garagedoor') {
+            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, e);
+            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, e);
+            this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.ObstructionDetected, e);
+        }
+        else if (this.device.bot?.deviceType === 'door') {
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.PositionState, e);
+        }
+        else if (this.device.bot?.deviceType === 'lock') {
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockTargetState, e);
+            this.doorService?.updateCharacteristic(this.platform.Characteristic.LockCurrentState, e);
+        }
+        else if (this.device.bot?.deviceType === 'switch') {
             this.switchService?.updateCharacteristic(this.platform.Characteristic.On, e);
         }
         else {
@@ -727,7 +798,16 @@ class Bot {
         }
         else if (this.device.bot?.deviceType === 'door') {
             this.debugLog(`Bot: ${this.accessory.displayName} TargetPosition: ${value}`);
-            if (value === 100) {
+            if (value === 0) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
+            }
+        }
+        else if (this.device.bot?.deviceType === 'lock') {
+            this.debugLog(`Bot: ${this.accessory.displayName} LockTargetState: ${value}`);
+            if (value === this.platform.Characteristic.LockTargetState.SECURED) {
                 this.On = false;
             }
             else {