@switchbot/homebridge-switchbot 1.6.2-beta.1 → 1.6.4-beta.0

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
+## [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)
+
+**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.6.3...v1.7.0
+
+## [Version 1.6.3](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.6.3) (2022-01-03)
+
+## What's Changed
+* Quick Fix for for issue not tested in `v1.6.2`.
+
+**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.6.2...v1.6.3
+
+## [Version 1.6.2](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.6.2) (2022-01-03)
+
+## What's Changed
+* Fixed Bug: npm ERR! code 1. [#151](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/151)
+    * Made `node-switchbot` an optionalDependencies
+    * So If `node-switchbot` doesn't get installed successfully then BLE will not work.
+* Housekeeping and updated dependencies.
+
+**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.6.1...v1.6.2
+
 ## [Version 1.6.1](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.6.1) (2022-01-02)
 
 ## What's Changed

package/config.schema.json

@@ -182,6 +182,12 @@
                             "outlet"
                           ]
                         },
+                        {
+                          "title": "Garage Door",
+                          "enum": [
+                            "garagedoor"
+                          ]
+                        },
                         {
                           "title": "Switch",
                           "enum": [

package/dist/devices/bots.d.ts

@@ -11,8 +11,9 @@ export declare class Bot {
     private readonly platform;
     private accessory;
     device: device & devicesConfig;
-    private outletService?;
     private switchService?;
+    private garageDoorService?;
+    private outletService?;
     private batteryService?;
     On: CharacteristicValue;
     OnCached: CharacteristicValue;
@@ -33,6 +34,9 @@ export declare class Bot {
     botUpdateInProgress: boolean;
     doBotUpdate: Subject<void>;
     constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: device & devicesConfig);
+    private removeOutletService;
+    private removeGarageDoorService;
+    private removeSwitchService;
     refreshRate(): void;
     scan(): void;
     logs(): void;
@@ -49,6 +53,7 @@ export declare class Bot {
     refreshStatus(): Promise<void>;
     private connectBLE;
     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;IAqCZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IArCvC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,OAAO,CAAC,cAAc,CAAC,CAAU;IAGjC,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;IAuIvC,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;YA8DhB,oBAAoB;IAuBlC;;;;;;OAMG;IACG,WAAW;YAcH,cAAc;IAwE5B,OAAO,CAAC,SAAS;YAQH,kBAAkB;IAmDhC;;OAEG;IACH,4BAA4B;IA2BrB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAatB,OAAO,CAAC,UAAU;IA+BlB,OAAO,CAAC,UAAU;IAWlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAMnB;;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;IAuCZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IAvCvC,OAAO,CAAC,aAAa,CAAC,CAAU;IAChC,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;IAmIvC,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,uBAAuB;IAS/B,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;IAqDrB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAatB,OAAO,CAAC,UAAU;IA+BlB,OAAO,CAAC,UAAU;IAWlB;;OAEG;IACH,OAAO,CAAC,WAAW;IAenB;;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,34 +52,38 @@ 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') {
-            // If outletService still pressent, then remove first
-            if (this.outletService) {
-                this.debugLog(`Bot: ${accessory.displayName} Removing Leftover outletService first`);
-            }
-            this.outletService = this.accessory.getService(this.platform.Service.Outlet);
-            accessory.removeService(this.outletService);
+            this.removeOutletService(accessory);
+            this.removeGarageDoorService(accessory);
             // Add switchService
             (this.switchService =
                 accessory.getService(this.platform.Service.Switch) ||
                     accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Switch`;
-            if (this.deviceLogging !== 'none') {
-                this.infoLog(`Bot: ${accessory.displayName} Displaying as Switch`);
-            }
-            this.switchService?.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+            this.infoLog(`Bot: ${accessory.displayName} Displaying as Switch`);
+            this.switchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+            this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
+        }
+        else if (device.bot?.deviceType === 'garagedoor') {
+            this.removeOutletService(accessory);
+            this.removeSwitchService(accessory);
+            // Add switchService
+            (this.garageDoorService =
+                accessory.getService(this.platform.Service.GarageDoorOpener) ||
+                    accessory.addService(this.platform.Service.GarageDoorOpener)), `${accessory.displayName} Garage Door Opener`;
+            this.infoLog(`Bot: ${accessory.displayName} Displaying as Garage Door Opener`);
+            this.garageDoorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+            this.garageDoorService.getCharacteristic(this.platform.Characteristic.TargetDoorState).onSet(this.handleOnSet.bind(this));
+            this.garageDoorService.setCharacteristic(this.platform.Characteristic.ObstructionDetected, false);
         }
         else {
-            // If switchService still pressent, then remove first
-            if (this.switchService) {
-                this.debugLog(`Bot: ${accessory.displayName} Removing Leftover switchService first`);
-            }
-            this.switchService = this.accessory.getService(this.platform.Service.Switch);
-            accessory.removeService(this.switchService);
+            this.removeSwitchService(accessory);
+            this.removeGarageDoorService(accessory);
             // Add outletService
             (this.outletService =
                 accessory.getService(this.platform.Service.Outlet) ||
                     accessory.addService(this.platform.Service.Outlet)), `${accessory.displayName} Outlet`;
             this.infoLog(`Bot: ${accessory.displayName} Displaying as Outlet`);
-            this.outletService?.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+            this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+            this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
         }
         if (device.ble) {
             (this.batteryService =
@@ -87,14 +91,6 @@ class Bot {
                     accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
             this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
         }
-        // each service must implement at-minimum the "required characteristics" for the given service type
-        // see https://developers.homebridge.io/#/service/Outlet
-        if (device.bot?.deviceType === 'switch') {
-            this.switchService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
-        }
-        else {
-            this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
-        }
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -131,6 +127,30 @@ class Bot {
             this.botUpdateInProgress = false;
         });
     }
+    removeOutletService(accessory) {
+        // If outletService still pressent, then remove first
+        if (this.outletService) {
+            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover outletService first`);
+        }
+        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
+        accessory.removeService(this.outletService);
+    }
+    removeGarageDoorService(accessory) {
+        // If outletService still pressent, then remove first
+        if (this.outletService) {
+            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover outletService first`);
+        }
+        this.outletService = this.accessory.getService(this.platform.Service.Outlet);
+        accessory.removeService(this.outletService);
+    }
+    removeSwitchService(accessory) {
+        // If switchService still pressent, then remove first
+        if (this.switchService) {
+            this.debugLog(`Bot: ${accessory.displayName} Removing Leftover switchService first`);
+        }
+        this.switchService = this.accessory.getService(this.platform.Service.Switch);
+        accessory.removeService(this.switchService);
+    }
     refreshRate() {
         if (this.device.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
@@ -284,61 +304,68 @@ class Bot {
         // Convert to BLE Address
         const switchbot = this.connectBLE();
         // Start to monitor advertisement packets
-        this.warnLog(`Bot: ${this.accessory.displayName} platform.Switchbot: ${JSON.stringify(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}`);
+        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();
                 }
                 else {
-                    this.connected = false;
-                    this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
+                    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)}`);
                 }
-            };
-            // 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();
                 }
-            }
-        }).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);
-        });
+                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();
+        }
     }
     async openAPIRefreshStatus() {
         if (this.platform.config.credentials?.openToken) {
@@ -388,71 +415,80 @@ class Bot {
         if (this.On !== this.OnCached) {
             this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
             const switchbot = this.connectBLE();
-            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 (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)}`);
                         }
-                        else {
-                            this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+                        if (this.platform.debugMode) {
+                            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                                + ` Error: ${JSON.stringify(e)}`);
                         }
-                        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);
-                });
+                        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 {
+                    throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+                }
             }
             else {
-                throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+                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;
@@ -521,17 +557,41 @@ class Bot {
      * Updates the status for each of the HomeKit Characteristics
      */
     updateHomeKitCharacteristics() {
-        if (this.On === undefined) {
-            this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        if (this.device.bot?.deviceType === 'garagedoor') {
+            if (this.On === undefined) {
+                this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+            }
+            else {
+                if (this.On) {
+                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, this.platform.Characteristic.TargetDoorState.OPEN);
+                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.OPEN);
+                    this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+                }
+                else {
+                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.TargetDoorState, this.platform.Characteristic.TargetDoorState.CLOSED);
+                    this.garageDoorService?.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.CLOSED);
+                    this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+                }
+            }
+            this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
-        else {
-            if (this.device.bot?.deviceType === 'switch') {
+        else if (this.device.bot?.deviceType === 'switch') {
+            if (this.On === undefined) {
+                this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+            }
+            else {
                 this.switchService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+                this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            }
+        }
+        else {
+            if (this.On === undefined) {
+                this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             }
             else {
                 this.outletService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
+                this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
             }
-            this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
         if (this.device.ble) {
             if (this.BatteryLevel === undefined) {
@@ -608,8 +668,19 @@ class Bot {
      * Handle requests to set the "On" characteristic
      */
     handleOnSet(value) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${value}`);
-        this.On = value;
+        if (this.device.bot?.deviceType === 'garagedoor') {
+            this.debugLog(`Bot: ${this.accessory.displayName} TargetDoorState: ${value}`);
+            if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
+                this.On = false;
+            }
+            else {
+                this.On = true;
+            }
+        }
+        else {
+            this.debugLog(`Bot: ${this.accessory.displayName} On: ${value}`);
+            this.On = value;
+        }
         this.doBotUpdate.next();
     }
     /**