@switchbot/homebridge-switchbot 2.0.0-beta.18 → 2.0.0-beta.19

package/src/device/bot.ts

@@ -53,6 +53,7 @@ export class Bot {
   scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
+  OpenAPI?: boolean;
 
   // Others
   doublePress!: number;
@@ -64,6 +65,7 @@ export class Bot {
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: device & devicesConfig) {
     // default placeholders
     this.logs(device);
+    this.openAPI();
     this.scan(device);
     this.refreshRate(device);
     this.PressOrSwitch(device);
@@ -117,7 +119,7 @@ export class Bot {
       // Add switchService
       (this.switchService = accessory.getService(this.platform.Service.Switch) || accessory.addService(this.platform.Service.Switch)),
       `${accessory.displayName} Switch`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Switch`);
+      this.infoLog(`${this.device.deviceType}: ${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));
@@ -136,7 +138,7 @@ export class Bot {
       (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.infoLog(`${this.device.deviceType}: ${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));
@@ -155,7 +157,7 @@ export class Bot {
       // Add switchService
       (this.doorService = accessory.getService(this.platform.Service.Door) || accessory.addService(this.platform.Service.Door)),
       `${accessory.displayName} Door`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Door`);
+      this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Door`);
 
       this.doorService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.doorService
@@ -182,7 +184,7 @@ export class Bot {
       // Add switchService
       (this.windowService = accessory.getService(this.platform.Service.Window) || accessory.addService(this.platform.Service.Window)),
       `${accessory.displayName} Window`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Window`);
+      this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window`);
 
       this.windowService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.windowService
@@ -210,7 +212,7 @@ export class Bot {
       (this.windowCoveringService =
         accessory.getService(this.platform.Service.WindowCovering) || accessory.addService(this.platform.Service.WindowCovering)),
       `${accessory.displayName} Window Covering`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Window Covering`);
+      this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window Covering`);
 
       this.windowCoveringService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.windowCoveringService
@@ -237,7 +239,7 @@ export class Bot {
       // 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.infoLog(`${this.device.deviceType}: ${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));
@@ -255,7 +257,7 @@ export class Bot {
       // Add switchService
       (this.faucetService = accessory.getService(this.platform.Service.Faucet) || accessory.addService(this.platform.Service.Faucet)),
       `${accessory.displayName} Faucet`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Faucet`);
+      this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Faucet`);
 
       this.faucetService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.faucetService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.handleOnSet.bind(this));
@@ -273,7 +275,7 @@ export class Bot {
       // Add switchService
       (this.fanService = accessory.getService(this.platform.Service.Fan) || accessory.addService(this.platform.Service.Fan)),
       `${accessory.displayName} Fan`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Fan`);
+      this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Fan`);
 
       this.fanService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.fanService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
@@ -293,7 +295,7 @@ export class Bot {
         accessory.getService(this.platform.Service.StatefulProgrammableSwitch) ||
         accessory.addService(this.platform.Service.StatefulProgrammableSwitch)),
       `${accessory.displayName} Stateful Programmable Switch`;
-      this.infoLog(`Bot: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
+      this.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
 
       this.statefulProgrammableSwitchService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.statefulProgrammableSwitchService
@@ -313,7 +315,7 @@ export class Bot {
       // 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.infoLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Outlet`);
 
       this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
       this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
@@ -321,17 +323,17 @@ export class Bot {
 
     // Battery Service
     if (!device.ble) {
-      this.debugLog(`Bot: ${accessory.displayName} Removing Battery Service`);
+      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Battery Service`);
       this.batteryService = this.accessory.getService(this.platform.Service.Battery);
       accessory.removeService(this.batteryService!);
     } else if (device.ble && !this.batteryService) {
-      this.debugLog(`Bot: ${accessory.displayName} Add Battery Service`);
+      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Battery Service`);
       (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || this.accessory.addService(this.platform.Service.Battery)),
       `${accessory.displayName} Battery`;
 
       this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
     } else {
-      this.debugLog(`Bot: ${accessory.displayName} Battery Service Not Added`);
+      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);
     }
 
     // Retrieve initial values and updateHomekit
@@ -361,12 +363,13 @@ export class Bot {
               await this.pushChanges();
             });
         } catch (e: any) {
-          this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges`);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
           if (this.deviceLogging.includes('debug')) {
-            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${superStringify(e.message)}`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,`
+            + ` Error Message: ${superStringify(e.message)}`);
           }
           if (this.platform.debugMode) {
-            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${superStringify(e)}`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${superStringify(e)}`);
           }
         }
         this.botUpdateInProgress = false;
@@ -385,18 +388,18 @@ export class Bot {
   }
 
   async BLEparseStatus(): Promise<void> {
-    this.debugLog(`Bot: ${this.accessory.displayName} BLE parseStatus`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE parseStatus`);
     // BLEmode (true if Switch Mode) | (false if Press Mode)
     if (this.mode) {
       this.accessory.context.On = this.On;
       if (this.On === undefined) {
         this.On = Boolean(this.state);
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, mode: ${this.mode}, On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, mode: ${this.mode}, On: ${this.On}`);
     } else {
       this.On = false;
       this.accessory.context.On = this.On;
-      this.debugLog(`Bot: ${this.accessory.displayName} Press Mode, mode: ${this.mode}, On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode, mode: ${this.mode}, On: ${this.On}`);
     }
 
     this.BatteryLevel = Number(this.battery);
@@ -408,7 +411,7 @@ export class Bot {
     if (Number.isNaN(this.BatteryLevel)) {
       this.BatteryLevel = 100;
     }
-    this.debugLog(`Bot: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
   }
 
   async openAPIparseStatus(): Promise<void> {
@@ -416,7 +419,7 @@ export class Bot {
       this.SwitchToOpenAPI = false;
     }
     if (this.platform.config.credentials?.token) {
-      this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI parseStatus`);
       if (this.botMode === 'press') {
         this.On = false;
         this.accessory.context.On = this.On;
@@ -426,7 +429,7 @@ export class Bot {
           this.On = false;
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
     }
   }
 
@@ -442,18 +445,18 @@ export class Bot {
   }
 
   async BLERefreshStatus(): Promise<void> {
-    this.debugLog(`Bot: ${this.accessory.displayName} BLE refreshStatus`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE refreshStatus`);
     const switchbot = await this.platform.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}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     this.getCustomBLEAddress(switchbot);
     // Start to monitor advertisement packets
     if (switchbot === false) {
-      this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
+      this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
     }
     switchbot
       .startScan({
@@ -467,25 +470,25 @@ export class Bot {
           if (this.deviceLogging.includes('debug')) {
             this.infoLog(this.address);
             this.infoLog(this.device.bleMac);
-            this.infoLog(`Bot: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
-            this.infoLog(`Bot: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
           }
           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: ${superStringify(ad.serviceData)}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
           this.debugLog(
-            `Bot: ${this.accessory.displayName}, model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName},` +
+            `${this.device.deviceType}: ${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}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
           } else {
             this.connected = false;
-            this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
           }
         };
         // Wait 2 seconds
@@ -498,23 +501,24 @@ export class Bot {
           this.parseStatus();
           this.updateHomeKitCharacteristics();
         } else {
-          this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
           if (this.platform.config.credentials?.token) {
-            this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
             this.SwitchToOpenAPI = true;
             await this.openAPIRefreshStatus();
           }
         }
       })
       .catch(async (e: any) => {
-        this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
         if (this.deviceLogging.includes('debug')) {
           this.errorLog(
-            `Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${superStringify(e.message)}`,
+            `${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with BLE Connection,`
+            + ` Error Message: ${superStringify(e.message)}`,
           );
         }
         if (this.platform.config.credentials?.token) {
-          this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
           this.SwitchToOpenAPI = true;
           await this.openAPIRefreshStatus();
         }
@@ -531,7 +535,7 @@ export class Bot {
         });
         // Set an event handler
         switchbot.onadvertisement = (ad: any) => {
-          this.warnLog(`Bot: ${this.accessory.displayName} ad: ${superStringify(ad, null, '  ')}`);
+          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${superStringify(ad, null, '  ')}`);
         };
         await switchbot.wait(10000);
         // Stop to monitor
@@ -541,15 +545,15 @@ export class Bot {
   }
 
   async openAPIRefreshStatus(): Promise<void> {
-    if (this.platform.config.credentials?.token) {
-      this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI refreshStatus`);
+    if (this.platform.config.credentials?.token && this.OpenAPI) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI refreshStatus`);
       try {
         const t = Date.now();
         const nonce = 'requestID';
         const data = this.platform.config.credentials?.token + t + nonce;
         const signTerm = crypto.createHmac('sha256', this.platform.config.credentials?.secret).update(Buffer.from(data, 'utf-8')).digest();
         const sign = signTerm.toString('base64');
-        this.debugLog(`Bot: ${this.accessory.displayName} sign: ${sign}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -564,7 +568,7 @@ export class Bot {
           },
         };
         const req = https.request(options, (res) => {
-          this.debugLog(`Bot: ${this.accessory.displayName} Refresh statusCode: ${res.statusCode}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Refresh statusCode: ${res.statusCode}`);
           let rawData = '';
           res.on('data', (d) => {
             rawData += d;
@@ -573,31 +577,35 @@ export class Bot {
           res.on('end', () => {
             try {
               this.deviceStatus = JSON.parse(rawData);
-              this.debugLog(`Bot: ${this.accessory.displayName} refreshStatus: ${superStringify(this.deviceStatus)}`);
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${superStringify(this.deviceStatus)}`);
               this.power = this.deviceStatus.body.power;
               this.parseStatus();
               this.updateHomeKitCharacteristics();
             } catch (e: any) {
-              this.errorLog(`Bot: ${this.accessory.displayName} error message: ${e.message}`);
+              this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
             }
           });
         });
         req.on('error', (e: any) => {
-          this.errorLog(`Bot: ${this.accessory.displayName} error message: ${e.message}`);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
         });
         req.end();
       } catch (e: any) {
-        this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
         if (this.deviceLogging.includes('debug')) {
           this.errorLog(
-            `Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
+            `${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+            + ` Error Message: ${superStringify(e.message)}`,
           );
         }
         if (this.platform.debugMode) {
-          this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${superStringify(e)}`);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,`
+          + ` Error: ${superStringify(e)}`);
         }
         this.apiError(e);
       }
+    } else {
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, commands will not be sent.`);
     }
   }
 
@@ -622,27 +630,27 @@ export class Bot {
   }
 
   async BLEpushChanges(): Promise<void> {
-    this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
     if (this.On !== this.accessory.context.On || this.allowPush) {
-      this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE pushChanges`);
       const switchbot = await this.platform.connectBLE();
       // Convert to BLE Address
       this.device.bleMac = this.device
         .deviceId!.match(/.{1,2}/g)!
         .join(':')
         .toLowerCase();
-      this.debugLog(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
       //if (switchbot !== false) {
       if (this.botMode === 'press') {
-        this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
         switchbot
           .discover({ model: 'H', quick: true, id: this.device.bleMac })
           .then((device_list: { press: (arg0: { id: string | undefined }) => any }[]) => {
-            this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
             return device_list[0].press({ id: this.device.bleMac });
           })
           .then(() => {
-            this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
             this.accessory.context.On = this.On;
             setTimeout(() => {
               if (this.device.bot?.deviceType === 'switch') {
@@ -650,55 +658,59 @@ export class Bot {
               } else {
                 this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
               }
-              this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
             }, 500);
           })
           .catch(async (e: any) => {
-            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
             if (this.deviceLogging.includes('debug')) {
               this.errorLog(
-                `Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${superStringify(e.message)}`,
+                `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                + ` Error Message: ${superStringify(e.message)}`,
               );
             }
             if (this.platform.debugMode) {
-              this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${superStringify(e)}`);
+              this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+              + ` Error: ${superStringify(e)}`);
             }
             if (this.platform.config.credentials?.token) {
-              this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+              this.warnLog(`${this.device.deviceType}: ${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}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
         switchbot
           .discover({ model: 'H', quick: true, id: this.device.bleMac })
           .then((device_list: any) => {
-            this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
             return this.turnOnOff(device_list);
           })
           .then(() => {
-            this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
             this.accessory.context.On = this.On;
           })
           .catch(async (e: any) => {
-            this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
             if (this.deviceLogging.includes('debug')) {
               this.errorLog(
-                `Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${superStringify(e.message)}`,
+                `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+                + ` Error Message: ${superStringify(e.message)}`,
               );
             }
             if (this.platform.debugMode) {
-              this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${superStringify(e)}`);
+              this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+              + ` Error: ${superStringify(e)}`);
             }
             if (this.platform.config.credentials?.token) {
-              this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+              this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection`);
               await this.openAPIpushChanges();
             }
             this.apiError(e);
           });
       } else {
-        throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+        throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
       }
     }
     this.accessory.context.On = this.On;
@@ -718,10 +730,10 @@ export class Bot {
   }
 
   async openAPIpushChanges(): Promise<void> {
-    if (this.platform.config.credentials?.token) {
+    if (this.platform.config.credentials?.token && this.OpenAPI) {
       try {
         if (this.On !== this.accessory.context.On || this.allowPush) {
-          this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI pushChanges`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI pushChanges`);
           // Make Push On request to the API
           const t = Date.now();
           const nonce = 'requestID';
@@ -730,29 +742,29 @@ export class Bot {
             .update(Buffer.from(data, 'utf-8'))
             .digest();
           const sign = signTerm.toString('base64');
-          this.debugLog(`Bot: ${this.accessory.displayName} sign: ${sign}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
           let command = '';
           if (this.botMode === 'switch' && this.On) {
             command = 'turnOn';
             this.On = true;
-            this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
           } else if (this.botMode === 'switch' && !this.On) {
             command = 'turnOff';
             this.On = false;
-            this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
           } else if (this.botMode === 'press') {
             command = 'press';
-            this.debugLog(`Bot: ${this.accessory.displayName} Press Mode`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Press Mode`);
             this.On = false;
           } else {
-            throw new Error(`Bot: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
+            throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Device Paramters not set for this Bot.`);
           }
           const body = superStringify({
             'command': `${command}`,
             'parameter': 'default',
             'commandType': 'command',
           });
-          this.infoLog(`Bot: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+          this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
           const options = {
             hostname: HostDomain,
             port: 443,
@@ -768,32 +780,38 @@ export class Bot {
             },
           };
           const req = https.request(options, res => {
-            this.debugLog(`Bot: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${res.statusCode}`);
             this.statusCode({ res });
             res.on('data', d => {
-              this.debugLog(`Bot: ${this.accessory.displayName} d: ${d}`);
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} d: ${d}`);
             });
           });
           req.on('error', (e: any) => {
-            this.errorLog(`Bot: ${this.accessory.displayName} error message: ${e.message}`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} error message: ${e.message}`);
           });
           req.write(body);
           req.end();
-          this.debugLog(`Bot: ${this.accessory.displayName} openAPIpushChanges: ${superStringify(req)}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges: ${superStringify(req)}`);
           this.accessory.context.On = this.On;
         }
       } catch (e: any) {
-        this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
         if (this.deviceLogging.includes('debug')) {
           this.errorLog(
-            `Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${superStringify(e.message)}`,
+            `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+            + ` Error Message: ${superStringify(e.message)}`,
           );
         }
         if (this.platform.debugMode) {
-          this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${superStringify(e)}`);
+          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
+          + ` Error: ${superStringify(e)}`);
         }
         this.apiError(e);
       }
+    } else {
+      if (this.deviceLogging.includes('debug')) {
+        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI is disabled, device status will not be sent.`);
+      }
     }
   }
 
@@ -803,7 +821,7 @@ export class Bot {
   async updateHomeKitCharacteristics(): Promise<void> {
     if (this.device.bot?.deviceType === 'garagedoor') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.garageDoorService?.updateCharacteristic(
@@ -814,7 +832,8 @@ export class Bot {
             this.platform.Characteristic.CurrentDoorState,
             this.platform.Characteristic.CurrentDoorState.OPEN,
           );
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+          this.debugLog(`${this.device.deviceType}: `
+          + `${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
         } else {
           this.garageDoorService?.updateCharacteristic(
             this.platform.Characteristic.TargetDoorState,
@@ -824,47 +843,48 @@ export class Bot {
             this.platform.Characteristic.CurrentDoorState,
             this.platform.Characteristic.CurrentDoorState.CLOSED,
           );
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
+          this.debugLog(`${this.device.deviceType}: `
+          +`${this.accessory.displayName} updateCharacteristic TargetDoorState: Open, CurrentDoorState: Open`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Garage Door On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Garage Door On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'door') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           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`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
         } else {
           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(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Door On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Door On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'window') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
           this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 100);
           this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
         } else {
           this.windowService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
           this.windowService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
           this.windowService?.updateCharacteristic(this.platform.Characteristic.PositionState, this.platform.Characteristic.PositionState.STOPPED);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Window On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Window On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'windowcovering') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 100);
@@ -873,7 +893,7 @@ export class Bot {
             this.platform.Characteristic.PositionState,
             this.platform.Characteristic.PositionState.STOPPED,
           );
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 100, CurrentPosition: 100`);
         } else {
           this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.TargetPosition, 0);
           this.windowCoveringService?.updateCharacteristic(this.platform.Characteristic.CurrentPosition, 0);
@@ -881,13 +901,13 @@ export class Bot {
             this.platform.Characteristic.PositionState,
             this.platform.Characteristic.PositionState.STOPPED,
           );
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: 0, CurrentPosition: 0`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Window Covering On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Window Covering On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'lock') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.lockService?.updateCharacteristic(
@@ -898,46 +918,48 @@ export class Bot {
             this.platform.Characteristic.LockCurrentState,
             this.platform.Characteristic.LockCurrentState.UNSECURED,
           );
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic LockTargetState: UNSECURED, LockCurrentState: UNSECURED`);
+          this.debugLog(`${this.device.deviceType}: `
+          + `${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(`${this.device.deviceType}: `
+          + `${this.accessory.displayName} updateCharacteristic LockTargetState: SECURED, LockCurrentState: SECURED`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Lock On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Lock On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'faucet') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.ACTIVE);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
         } else {
           this.faucetService?.updateCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.INACTIVE);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.On}`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Faucet On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Faucet On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'fan') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.fanService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         } else {
           this.fanService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} Fan On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Fan On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'stateful') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
       } else {
         if (this.On) {
           this.statefulProgrammableSwitchService?.updateCharacteristic(
@@ -945,47 +967,49 @@ export class Bot {
             this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,
           );
           this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, 1);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1`);
+          this.debugLog(`${this.device.deviceType}: `
+          + `${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 1`);
         } else {
           this.statefulProgrammableSwitchService?.updateCharacteristic(
             this.platform.Characteristic.ProgrammableSwitchEvent,
             this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,
           );
           this.statefulProgrammableSwitchService?.updateCharacteristic(this.platform.Characteristic.ProgrammableSwitchOutputState, 0);
-          this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0`);
+          this.debugLog(`${this.device.deviceType}: `
+          + `${this.accessory.displayName} updateCharacteristic ProgrammableSwitchEvent: SINGLE, ProgrammableSwitchOutputState: 0`);
         }
       }
-      this.debugLog(`Bot: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.On}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatefulProgrammableSwitch On: ${this.On}`);
     } else if (this.device.bot?.deviceType === 'switch') {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${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}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
       }
     } else {
       if (this.On === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${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(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
       }
     }
     this.accessory.context.On = this.On;
     if (this.device.ble) {
       if (this.BatteryLevel === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
       } else {
         this.accessory.context.BatteryLevel = this.BatteryLevel;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-        this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
       }
       if (this.StatusLowBattery === undefined) {
-        this.debugLog(`Bot: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
       } else {
         this.accessory.context.StatusLowBattery = this.StatusLowBattery;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-        this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
       }
     }
   }
@@ -1032,33 +1056,33 @@ export class Bot {
   async statusCode({ res }: { res: IncomingMessage }): Promise<void> {
     switch (res.statusCode) {
       case 151:
-        this.errorLog(`Bot: ${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(`Bot: ${this.accessory.displayName} Device not found.`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
         break;
       case 160:
-        this.errorLog(`Bot: ${this.accessory.displayName} Command is not supported.`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
         break;
       case 161:
-        this.errorLog(`Bot: ${this.accessory.displayName} Device is offline.`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
         this.offlineOff();
         break;
       case 171:
-        this.errorLog(`Bot: ${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(
-          `Bot: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
+          `${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
             ` Or command: ${superStringify(res)} format is invalid`,
         );
         break;
       case 100:
-        this.debugLog(`Bot: ${this.accessory.displayName} Command successfully sent.`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
         break;
       default:
-        this.debugLog(`Bot: ${this.accessory.displayName} Unknown statusCode.`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
     }
   }
 
@@ -1078,7 +1102,7 @@ export class Bot {
    */
   async handleOnSet(value: CharacteristicValue): Promise<void> {
     if (this.device.bot?.deviceType === 'garagedoor') {
-      this.debugLog(`Bot: ${this.accessory.displayName} TargetDoorState: ${value}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetDoorState: ${value}`);
       if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
         this.On = false;
       } else {
@@ -1089,35 +1113,35 @@ export class Bot {
       this.device.bot?.deviceType === 'window' ||
       this.device.bot?.deviceType === 'windowcovering'
     ) {
-      this.debugLog(`Bot: ${this.accessory.displayName} TargetPosition: ${value}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${value}`);
       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}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockTargetState: ${value}`);
       if (value === this.platform.Characteristic.LockTargetState.SECURED) {
         this.On = false;
       } else {
         this.On = true;
       }
     } else if (this.device.bot?.deviceType === 'faucet') {
-      this.debugLog(`Bot: ${this.accessory.displayName} Active: ${value}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Active: ${value}`);
       if (value === this.platform.Characteristic.Active.INACTIVE) {
         this.On = false;
       } else {
         this.On = true;
       }
     } else if (this.device.bot?.deviceType === 'stateful') {
-      this.debugLog(`Bot: ${this.accessory.displayName} ProgrammableSwitchOutputState: ${value}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ProgrammableSwitchOutputState: ${value}`);
       if (value === 0) {
         this.On = false;
       } else {
         this.On = true;
       }
     } else {
-      this.debugLog(`Bot: ${this.accessory.displayName} On: ${value}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${value}`);
       this.On = value;
     }
     this.doBotUpdate.next();
@@ -1153,6 +1177,9 @@ export class Bot {
     if (device.ble) {
       config['ble'] = device.ble;
     }
+    if (device.openAPI !== undefined) {
+      config['openAPI'] = device.openAPI;
+    }
     if (device.logging !== undefined) {
       config['logging'] = device.logging;
     }
@@ -1166,30 +1193,39 @@ export class Bot {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog(`Bot: ${this.accessory.displayName} Config: ${superStringify(config)}`);
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
   }
 
   async refreshRate(device: device & devicesConfig): Promise<void> {
     if (device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-      this.debugLog(`Bot: ${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(`Bot: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+    }
+  }
+
+  async openAPI() {
+    if (!this.device.openAPI) {
+      this.OpenAPI = true;
+    } else {
+      this.OpenAPI = this.device.openAPI;
     }
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI: ${this.OpenAPI}`);
   }
 
   async scan(device: device & devicesConfig): Promise<void> {
     if (device.scanDuration) {
       this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
       if (device.ble) {
-        this.debugLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
       }
     } else {
       this.scanDuration = this.accessory.context.scanDuration = 1;
       if (this.device.ble) {
-        this.debugLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
       }
     }
   }
@@ -1197,24 +1233,25 @@ export class Bot {
   async logs(device: device & devicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode';
-      this.debugLog(`Bot: ${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(`Bot: ${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(`Bot: ${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(`Bot: ${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: PlatformAccessory<Context>, device: device & devicesConfig): CharacteristicValue {
     let FirmwareRevision: string;
-    this.debugLog(`Bot: ${this.accessory.displayName} accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
-    this.debugLog(`Bot: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
-    this.debugLog(`Bot: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+    + ` accessory.context.FirmwareRevision: ${accessory.context.FirmwareRevision}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
     if (accessory.context.FirmwareRevision) {
       FirmwareRevision = accessory.context.FirmwareRevision;
     } else if (device.firmware) {
@@ -1228,16 +1265,16 @@ export class Bot {
   async PressOrSwitch(device: device & devicesConfig): Promise<void> {
     if (!device.bot?.mode) {
       this.botMode = 'switch';
-      this.warnLog(`Bot: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings,`);
-      this.warnLog(`Bot: ${this.accessory.displayName} is defaulting to "${this.botMode}" mode, you may experience issues.`);
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings,`);
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} is defaulting to "${this.botMode}" mode, you may experience issues.`);
     } else if (device.bot?.mode === 'switch') {
       this.botMode = 'switch';
-      this.debugLog(`Bot: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
     } else if (device.bot?.mode === 'press') {
       this.botMode = 'press';
-      this.debugLog(`Bot: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
     } else {
-      throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
+      throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
     }
   }
 
@@ -1247,14 +1284,14 @@ export class Bot {
     } else {
       this.allowPush = false;
     }
-    this.debugLog(`Bot: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Allowing Push Changes: ${this.allowPush}`);
   }
 
   async removeOutletService(accessory: PlatformAccessory): Promise<void> {
     // If outletService still pressent, then remove first
     this.outletService = this.accessory.getService(this.platform.Service.Outlet);
     if (this.outletService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Outlet Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
     }
     accessory.removeService(this.outletService!);
   }
@@ -1263,7 +1300,7 @@ export class Bot {
     // If garageDoorService still pressent, then remove first
     this.garageDoorService = this.accessory.getService(this.platform.Service.GarageDoorOpener);
     if (this.garageDoorService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Garage Door Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
     }
     accessory.removeService(this.garageDoorService!);
   }
@@ -1272,7 +1309,7 @@ export class Bot {
     // If doorService still pressent, then remove first
     this.doorService = this.accessory.getService(this.platform.Service.Door);
     if (this.doorService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Door Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
     }
     accessory.removeService(this.doorService!);
   }
@@ -1281,7 +1318,7 @@ export class Bot {
     // 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`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
     }
     accessory.removeService(this.lockService!);
   }
@@ -1290,7 +1327,7 @@ export class Bot {
     // If faucetService still pressent, then remove first
     this.faucetService = this.accessory.getService(this.platform.Service.Faucet);
     if (this.faucetService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Faucet Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Faucet Service`);
     }
     accessory.removeService(this.faucetService!);
   }
@@ -1299,7 +1336,7 @@ export class Bot {
     // If fanService still pressent, then remove first
     this.fanService = this.accessory.getService(this.platform.Service.Fan);
     if (this.fanService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Fan Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
     }
     accessory.removeService(this.fanService!);
   }
@@ -1308,7 +1345,7 @@ export class Bot {
     // If windowService still pressent, then remove first
     this.windowService = this.accessory.getService(this.platform.Service.Window);
     if (this.windowService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Window Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
     }
     accessory.removeService(this.windowService!);
   }
@@ -1317,7 +1354,7 @@ export class Bot {
     // If windowCoveringService still pressent, then remove first
     this.windowCoveringService = this.accessory.getService(this.platform.Service.WindowCovering);
     if (this.windowCoveringService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Window Covering Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
     }
     accessory.removeService(this.windowCoveringService!);
   }
@@ -1326,7 +1363,7 @@ export class Bot {
     // If statefulProgrammableSwitchService still pressent, then remove first
     this.statefulProgrammableSwitchService = this.accessory.getService(this.platform.Service.StatefulProgrammableSwitch);
     if (this.statefulProgrammableSwitchService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Stateful Programmable Switch Service`);
     }
     accessory.removeService(this.statefulProgrammableSwitchService!);
   }
@@ -1335,7 +1372,7 @@ export class Bot {
     // If switchService still pressent, then remove first
     this.switchService = this.accessory.getService(this.platform.Service.Switch);
     if (this.switchService) {
-      this.warnLog(`Bot: ${accessory.displayName} Removing Leftover Switch Service`);
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Switch Service`);
     }
     accessory.removeService(this.switchService!);
   }