wrap sending device update fully in queue

Author: bwp91

config.schema.json

@@ -84,12 +84,12 @@
           "functionBody": "return (!model.lanDisable);"
         }
       },
-      "bleControlInterval": {
-        "title": "BLE Control Interval",
+      "controlInterval": {
+        "title": "Control Interval",
         "type": "integer",
-        "description": "A minimum delay (in seconds) between device updates being sent. Increasing this may help if you find device updates are not working or if you use HomeKit scenes/groupings. Must be 5 or more.",
-        "placeholder": 5,
-        "minimum": 5
+        "description": "A minimum delay (in milliseconds) between device updates being sent. Increasing this may help if you find device updates are not working or if you use HomeKit scenes/groupings. Must be 0 or more.",
+        "placeholder": 250,
+        "minimum": 0
       },
       "colourSafeMode": {
         "type": "boolean",
@@ -1448,14 +1448,14 @@
       "items": [
         "ignoreMatter",
         "disableDeviceLogging",
+        "controlInterval",
         "httpRefreshTime",
         "awsDisable",
         "bleDisable",
         "bleRefreshTime",
         "lanDisable",
         "lanRefreshTime",
         "lanScanInterval",
-        "bleControlInterval",
         "colourSafeMode"
       ]
     },

lib/platform.js

@@ -118,8 +118,8 @@ export default class {
     Object.entries(config).forEach((entry) => {
       const [key, val] = entry
       switch (key) {
-        case 'bleControlInterval':
         case 'bleRefreshTime':
+        case 'controlInterval':
         case 'httpRefreshTime':
         case 'lanRefreshTime':
         case 'lanScanInterval': {
@@ -540,14 +540,9 @@ export default class {
         })
       }
 
-      // Config changed from milliseconds to seconds, so convert if needed
-      this.config.bleControlInterval = this.config.bleControlInterval >= 500
-        ? this.config.bleControlInterval / 1000
-        : this.config.bleControlInterval
-
       this.queue = new PQueue({
         concurrency: 1,
-        interval: this.config.bleControlInterval * 1000,
+        interval: this.config.controlInterval,
         intervalCap: 1,
         timeout: 10000,
         throwOnTimeout: true,
@@ -1711,28 +1706,28 @@ export default class {
       }
     }
 
-    // *********************************** //
-    // ********* CONNECTION: AWS ********* //
-    // *********************************** //
-    // Check to see if we have the option to use AWS
-    if (accessory.context.useAwsControl && data.awsParams) {
-      try {
-        await this.awsClient.updateDevice(accessory, data.awsParams)
-        return true
-      } catch (err) {
-        // Print the reason to the log if in debug mode, it's not always necessarily an error
-        accessory.logWarn(`${platformLang.notAWSSent} ${parseError(err, [platformLang.notAWSConn])}`)
+    return this.queue.add(async () => {
+      // *********************************** //
+      // ********* CONNECTION: AWS ********* //
+      // *********************************** //
+      // Check to see if we have the option to use AWS
+      if (accessory.context.useAwsControl && data.awsParams) {
+        try {
+          await this.awsClient.updateDevice(accessory, data.awsParams)
+          return true
+        } catch (err) {
+          // Print the reason to the log if in debug mode, it's not always necessarily an error
+          accessory.logWarn(`${platformLang.notAWSSent} ${parseError(err, [platformLang.notAWSConn])}`)
+        }
       }
-    }
 
-    // We can return now, if there is no option to use BLE
-    if (!data.bleParams) {
-      return true
-    }
+      // We can return now, if there is no option to use BLE
+      if (!data.bleParams) {
+        return true
+      }
 
-    // We use a queue for BLE connections for different reasons
-    // BLE: We don't want to send multiple commands at once, as it can cause issues
-    return this.queue.add(async () => {
+      // We use a queue for BLE connections for different reasons
+      // BLE: We don't want to send multiple commands at once, as it can cause issues
       // *********************************** //
       // ********* CONNECTION: BLE ********* //
       // *********************************** //

lib/utils/constants.js

@@ -6,13 +6,13 @@ export default {
     ignoreMatter: false,
     disableDeviceLogging: false,
     httpRefreshTime: 30,
+    controlInterval: 250,
     awsDisable: false,
     bleDisable: false,
     bleRefreshTime: 300,
     lanDisable: false,
     lanRefreshTime: 30,
     lanScanInterval: 60,
-    bleControlInterval: 5,
     colourSafeMode: false,
     lightDevices: [],
     switchDevices: [],
@@ -31,10 +31,10 @@ export default {
 
   defaultValues: {
     adaptiveLightingShift: 0,
-    bleControlInterval: 5,
     awsColourMode: 'default',
     bleRefreshTime: 300,
     brightnessStep: 1,
+    controlInterval: 250,
     httpRefreshTime: 30,
     lanRefreshTime: 30,
     lanScanInterval: 60,
@@ -44,9 +44,9 @@ export default {
 
   minValues: {
     adaptiveLightingShift: -1,
-    bleControlInterval: 5,
     bleRefreshTime: 60,
     brightnessStep: 1,
+    controlInterval: 0,
     httpRefreshTime: 30,
     lanRefreshTime: 10,
     lanScanInterval: 30,

package-lock.json

@@ -70,6 +70,6 @@
     "@stoprocent/noble": "^2.3.10"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^6.7.1"
+    "@antfu/eslint-config": "^6.7.3"
   }
 }