@switchbot/homebridge-switchbot 1.11.1 → 1.12.2-beta.0

package/package.json

@@ -1,80 +1,80 @@
 {
-  "displayName": "Homebridge SwitchBot",
-  "name": "@switchbot/homebridge-switchbot",
-  "version": "1.11.1",
-  "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
-  "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/OpenWonderLabs/homebridge-switchbot.git"
-  },
-  "bugs": {
-    "url": "https://github.com/OpenWonderLabs/homebridge-switchbot/issues"
-  },
-  "engines": {
-    "homebridge": "^1.4.0",
-    "node": "^14.18.3 || ^16.13.2"
-  },
-  "main": "dist/index.js",
-  "scripts": {
-    "check": "npm install && npm outdated",
-    "update": "ncu -u && npm update && npm install",
-    "lint": "eslint src/**.ts",
-    "watch": "npm run build && npm link && nodemon",
-    "build": "rimraf ./dist && tsc",
-    "prepublishOnly": "npm run lint && npm run build",
-    "postpublish": "npm run clean",
-    "clean": "rimraf ./dist",
-    "test": "eslint src/**.ts"
-  },
-  "funding": [
-    {
-      "type": "Paypal",
-      "url": "https://paypal.me/donavanbecker"
+    "displayName": "Homebridge SwitchBot",
+    "name": "@switchbot/homebridge-switchbot",
+    "version": "1.12.2-beta.0",
+    "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
+    "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
+    "license": "ISC",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/OpenWonderLabs/homebridge-switchbot.git"
     },
-    {
-      "type": "GitHub",
-      "url": "https://github.com/sponsors/donavanbecker"
+    "bugs": {
+        "url": "https://github.com/OpenWonderLabs/homebridge-switchbot/issues"
+    },
+    "engines": {
+        "homebridge": "^1.4.0",
+        "node": "^14.18.3 || ^16.13.2"
+    },
+    "main": "dist/index.js",
+    "scripts": {
+        "check": "npm install && npm outdated",
+        "update": "ncu -u && npm update && npm install",
+        "lint": "eslint src/**.ts",
+        "watch": "npm run build && npm link && nodemon",
+        "build": "rimraf ./dist && tsc",
+        "prepublishOnly": "npm run lint && npm run build",
+        "postpublish": "npm run clean",
+        "clean": "rimraf ./dist",
+        "test": "eslint src/**.ts"
+    },
+    "funding": [
+        {
+            "type": "Paypal",
+            "url": "https://paypal.me/donavanbecker"
+        },
+        {
+            "type": "GitHub",
+            "url": "https://github.com/sponsors/donavanbecker"
+        }
+    ],
+    "publishConfig": {
+        "access": "public"
+    },
+    "keywords": [
+        "homebridge-plugin",
+        "switchbot",
+        "humidifier",
+        "humidity",
+        "temperature",
+        "bot",
+        "curtains",
+        "windows",
+        "ble",
+        "ir"
+    ],
+    "dependencies": {
+        "@homebridge/plugin-ui-utils": "^0.0.19",
+        "axios": "^0.25.0",
+        "rxjs": "^7.5.2"
+    },
+    "devDependencies": {
+        "@types/node": "^17.0.14",
+        "@typescript-eslint/eslint-plugin": "^5.10.2",
+        "@typescript-eslint/parser": "^5.10.2",
+        "eslint": "^8.8.0",
+        "eslint-config-prettier": "8.3.0",
+        "eslint-plugin-prettier": "4.0.0",
+        "homebridge": "^1.4.0",
+        "nodemon": "^2.0.15",
+        "npm-check-updates": "^12.2.1",
+        "prettier": "2.5.1",
+        "rimraf": "^3.0.2",
+        "ts-node": "^10.4.0",
+        "typescript": "^4.5.5",
+        "typescript-axios-wb": "^1.0.3"
+    },
+    "optionalDependencies": {
+        "node-switchbot": "^1.1.2"
     }
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "homebridge-plugin",
-    "switchbot",
-    "humidifier",
-    "humidity",
-    "temperature",
-    "bot",
-    "curtains",
-    "windows",
-    "ble",
-    "ir"
-  ],
-  "dependencies": {
-    "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.25.0",
-    "rxjs": "^7.5.2"
-  },
-  "devDependencies": {
-    "@types/node": "^17.0.13",
-    "@typescript-eslint/eslint-plugin": "^5.10.1",
-    "@typescript-eslint/parser": "^5.10.1",
-    "eslint": "^8.8.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-prettier": "4.0.0",
-    "homebridge": "^1.4.0",
-    "nodemon": "^2.0.15",
-    "npm-check-updates": "^12.2.1",
-    "prettier": "2.5.1",
-    "rimraf": "^3.0.2",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.5",
-    "typescript-axios-wb": "^1.0.3"
-  },
-  "optionalDependencies": {
-    "node-switchbot": "^1.1.2"
-  }
 }

package/src/device/bot.ts

@@ -355,7 +355,7 @@ export class Bot {
             });
         } catch (e: any) {
           this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
           if (this.platform.debugMode) {
@@ -506,7 +506,7 @@ export class Bot {
       })
       .catch(async (e: any) => {
         this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Bot: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
@@ -534,7 +534,7 @@ export class Bot {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Bot: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
@@ -604,7 +604,7 @@ export class Bot {
           })
           .catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging === 'debug') {
+            if (this.deviceLogging.includes('debug')) {
               this.errorLog(
                 `Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
               );
@@ -633,7 +633,7 @@ export class Bot {
           })
           .catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging === 'debug') {
+            if (this.deviceLogging.includes('debug')) {
               this.errorLog(
                 `Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
               );
@@ -650,24 +650,22 @@ export class Bot {
       } else {
         throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
       }
-      /* } else {
-         this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
-         if (this.platform.config.credentials?.openToken) {
-           this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
-           await this.openAPIpushChanges();
-         }
-       }*/
     }
     this.OnCached = this.On;
     this.accessory.context.On = this.OnCached;
   }
 
   async turnOnOff(device_list: any): Promise<any> {
-    if (this.On) {
-      return device_list[0].turnOn({ id: this.device.bleMac });
-    } else {
-      return device_list[0].turnOff({ id: this.device.bleMac });
-    }
+    return await this.retry({
+      max: await this.maxRetry(),
+      fn: () => {
+        if (this.On) {
+          return device_list[0].turnOn({ id: this.device.bleMac });
+        } else {
+          return device_list[0].turnOff({ id: this.device.bleMac });
+        }
+      },
+    });
   }
 
   async openAPIpushChanges(): Promise<void> {
@@ -710,7 +708,7 @@ export class Bot {
         }
       } catch (e: any) {
         this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
@@ -1046,6 +1044,28 @@ export class Bot {
     this.doBotUpdate.next();
   }
 
+  async retry({ max, fn }: { max: number; fn: { (): any; (): Promise<any> } }): Promise<null> {
+    return fn().catch(async (err: any) => {
+      if (max === 0) {
+        throw err;
+      }
+      this.infoLog(err);
+      this.infoLog('Retrying');
+      await this.switchbot.wait(1000);
+      return this.retry({ max: max - 1, fn });
+    });
+  }
+
+  async maxRetry(): Promise<number> {
+    let maxRetry: number;
+    if (this.device.bot?.maxRetry) {
+      maxRetry = this.device.bot?.maxRetry;
+    } else {
+      maxRetry = 5;
+    }
+    return maxRetry;
+  }
+
   async config(device: device & devicesConfig): Promise<void> {
     let config = {};
     if (device.bot) {
@@ -1067,7 +1087,7 @@ export class Bot {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -1258,6 +1278,6 @@ export class Bot {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/colorbulb.ts

@@ -205,12 +205,9 @@ export class ColorBulb {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.colorBulbUpdateInProgress = false;
@@ -281,17 +278,12 @@ export class ColorBulb {
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -355,17 +347,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -404,17 +391,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -449,17 +431,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -491,17 +468,12 @@ export class ColorBulb {
       }
     } catch (e: any) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-      if (this.deviceLogging === 'debug') {
+      if (this.deviceLogging.includes('debug')) {
         this.errorLog(
           `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
             ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
-      if (this.platform.debugMode) {
-        this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-        );
-      }
       this.apiError(e);
     }
   }
@@ -700,7 +672,7 @@ export class ColorBulb {
       config['offline'] = device.offline;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -781,6 +753,6 @@ export class ColorBulb {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/contact.ts

@@ -314,15 +314,12 @@ export class Contact {
         })
         .catch(async (e: any) => {
           this.errorLog(`Contact Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Contact Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
                 ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Contact Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
             this.SwitchToOpenAPI = true;
@@ -357,17 +354,12 @@ export class Contact {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Contact Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Contact Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
               ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(
-            `Contact Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
-          );
-        }
         this.apiError(e);
       }
     }
@@ -450,7 +442,7 @@ export class Contact {
       config['scanDuration'] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Contact Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Contact Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -544,6 +536,6 @@ export class Contact {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }

package/src/device/curtain.ts

@@ -184,12 +184,9 @@ export class Curtain {
           await this.pushChanges();
         } catch (e: any) {
           this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
-          }
           this.apiError(e);
         }
         this.curtainUpdateInProgress = false;
@@ -425,14 +422,11 @@ export class Curtain {
         })
         .catch(async (e: any) => {
           this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
-          if (this.deviceLogging === 'debug') {
+          if (this.deviceLogging.includes('debug')) {
             this.errorLog(
               `Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
             );
           }
-          if (this.platform.debugMode) {
-            this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-          }
           if (this.platform.config.credentials?.openToken) {
             this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
             this.SwitchToOpenAPI = true;
@@ -467,14 +461,11 @@ export class Curtain {
         this.updateHomeKitCharacteristics();
       } catch (e: any) {
         this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-        }
         this.apiError(e);
       }
     }
@@ -516,14 +507,11 @@ export class Curtain {
           })
           .catch(async (e: any) => {
             this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-            if (this.deviceLogging === 'debug') {
+            if (this.deviceLogging.includes('debug')) {
               this.errorLog(
                 `Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
               );
             }
-            if (this.platform.debugMode) {
-              this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
-            }
             if (this.platform.config.credentials?.openToken) {
               this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
               await this.openAPIpushChanges();
@@ -575,14 +563,11 @@ export class Curtain {
         }
       } catch (e: any) {
         this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
-        if (this.deviceLogging === 'debug') {
+        if (this.deviceLogging.includes('debug')) {
           this.errorLog(
             `Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
           );
         }
-        if (this.platform.debugMode) {
-          this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
-        }
         this.apiError(e);
       }
     }
@@ -747,7 +732,7 @@ export class Curtain {
       config['scanDuration'] = device.scanDuration;
     }
     if (Object.entries(config).length !== 0) {
-      this.warnLog(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+      this.infoLog(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
   }
 
@@ -772,9 +757,9 @@ export class Curtain {
 
   async scan(device: device & devicesConfig): Promise<void> {
     if (device.scanDuration) {
-      if (this.deviceRefreshRate > device.scanDuration) {
-        this.scanDuration = this.deviceRefreshRate;
-        this.warnLog(`Curtain: ${this.accessory.displayName} scanDuration is less then refreshRate, overriding scanDuration with refreshRate`);
+      if (this.updateRate > device.scanDuration) {
+        this.scanDuration = this.updateRate;
+        this.warnLog(`Curtain: ${this.accessory.displayName} scanDuration is less then updateRate, overriding scanDuration with updateRate`);
       } else {
         this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
       }
@@ -782,9 +767,9 @@ export class Curtain {
         this.debugLog(`Curtain: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
       }
     } else {
-      if (this.deviceRefreshRate > 1) {
-        this.scanDuration = this.deviceRefreshRate;
-        this.warnLog(`Curtain: ${this.accessory.displayName} scanDuration is less then refreshRate, overriding scanDuration with refreshRate`);
+      if (this.updateRate > 1) {
+        this.scanDuration = this.updateRate;
+        this.warnLog(`Curtain: ${this.accessory.displayName} scanDuration is less then updateRate, overriding scanDuration with updateRate`);
       } else {
         this.scanDuration = this.accessory.context.scanDuration = 1;
       }
@@ -869,6 +854,6 @@ export class Curtain {
   }
 
   enablingDeviceLogging(): boolean {
-    return this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
+    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
 }