homebridge-plugin-utils 1.11.1 → 1.11.3

package/dist/featureoptions.js

@@ -391,7 +391,7 @@ export class FeatureOptions {
         option = option.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
         // This regular expression is a bit more intricate than you might think it should be due to the need to ensure we capture values at the very end of the option when
         // the option is enabled, and that we ignore the values at the end when the option is disabled in order to correctly traverse the hierarchy.
-        return new RegExp("^(Disable|Enable)\\." + option + (!id ? "" : "\\." + id) + "(?:(?<=^Enable\\." + option + (!id ? "" : "\\." + id) + ")\\.([^\\.]+))?$", "gi");
+        return new RegExp("^(Disable|Enable)\\." + option + (!id ? "" : "\\." + id) + "(?:(?<=^Enable\\." + option + (!id ? "" : "\\." + id) + ")\\.([^\\.]*))?$", "gi");
     }
 }
 //# sourceMappingURL=featureoptions.js.map

package/dist/ui/featureoptions.js

@@ -391,7 +391,7 @@ export class FeatureOptions {
         option = option.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
         // This regular expression is a bit more intricate than you might think it should be due to the need to ensure we capture values at the very end of the option when
         // the option is enabled, and that we ignore the values at the end when the option is disabled in order to correctly traverse the hierarchy.
-        return new RegExp("^(Disable|Enable)\\." + option + (!id ? "" : "\\." + id) + "(?:(?<=^Enable\\." + option + (!id ? "" : "\\." + id) + ")\\.([^\\.]+))?$", "gi");
+        return new RegExp("^(Disable|Enable)\\." + option + (!id ? "" : "\\." + id) + "(?:(?<=^Enable\\." + option + (!id ? "" : "\\." + id) + ")\\.([^\\.]*))?$", "gi");
     }
 }
 //# sourceMappingURL=featureoptions.js.map

package/dist/ui/webUi-featureoptions.mjs

@@ -536,7 +536,7 @@ export class webUiFeatureOptions {
 
           // Find the option in our list and delete it if it exists.
           const optionRegex = new RegExp("^(?:Enable|Disable)\\." + checkbox.id + (!currentDevice ? "" : ("\\." + currentDevice.serialNumber)) +
-            "(?:\\.([^\\.]+))?$", "gi");
+            "(?:\\.([^\\.]*))?$", "gi");
 
           const newOptions = this.#featureOptions.configuredOptions.filter(entry => !optionRegex.test(entry));
 

package/dist/util.d.ts

@@ -32,6 +32,18 @@ export interface HomebridgePluginLogging {
     info: (message: string, ...parameters: unknown[]) => void;
     warn: (message: string, ...parameters: unknown[]) => void;
 }
+/**
+ * A utility method that retries an operation at a specific interval for up to an absolute total number of retries.
+ * @param operation       - The operation callback to try until successful.
+ * @param retryInterval   - Interval to retry, in milliseconds.
+ * @param totalRetries    - Optionally, specify the total number of retries.
+ *
+ * @returns Returns `true` when the operation is successful, `false` otherwise or if the total number of retries has been exceeded.
+ *
+ * @remarks `operation` must be an asynchronous function that returns `true` when successful, and `false` otherwise.
+ *
+ * @category Utilities
+ */
 export declare function retry(operation: () => Promise<boolean>, retryInterval: number, totalRetries?: number): Promise<boolean>;
 export declare function runWithTimeout<T>(promise: Promise<T>, timeout: number): Promise<Nullable<T>>;
 export declare function sleep(sleepTimer: number): Promise<NodeJS.Timeout>;

package/dist/util.js

@@ -2,16 +2,27 @@
  *
  * util.ts: Useful utility functions when writing TypeScript.
  */
-// Retry an operation until we're successful.
+/**
+ * A utility method that retries an operation at a specific interval for up to an absolute total number of retries.
+ * @param operation       - The operation callback to try until successful.
+ * @param retryInterval   - Interval to retry, in milliseconds.
+ * @param totalRetries    - Optionally, specify the total number of retries.
+ *
+ * @returns Returns `true` when the operation is successful, `false` otherwise or if the total number of retries has been exceeded.
+ *
+ * @remarks `operation` must be an asynchronous function that returns `true` when successful, and `false` otherwise.
+ *
+ * @category Utilities
+ */
 export async function retry(operation, retryInterval, totalRetries) {
-    if ((totalRetries !== undefined) && (totalRetries < 0)) {
+    if ((totalRetries !== undefined) && (totalRetries <= 0)) {
         return false;
     }
     // Try the operation that was requested.
     if (!(await operation())) {
         // If the operation wasn't successful, let's sleep for the requested interval and try again.
         await sleep(retryInterval);
-        return retry(operation, retryInterval, (totalRetries === undefined) ? undefined : totalRetries--);
+        return retry(operation, retryInterval, (totalRetries === undefined) ? undefined : --totalRetries);
     }
     // We were successful - we're done.
     return true;

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2CH,6CAA6C;AAC7C,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,SAAiC,EAAE,aAAqB,EAAE,YAAqB;IAEzG,IAAG,CAAC,YAAY,KAAK,SAAS,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,EAAE,CAAC;QAEtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wCAAwC;IACxC,IAAG,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC,EAAE,CAAC;QAExB,4FAA4F;QAC5F,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC;QAE3B,OAAO,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IACpG,CAAC;IAED,mCAAmC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAI,OAAmB,EAAE,OAAe;IAE1E,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAEhG,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,4BAA4B;AAC5B,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,UAAkB;IAE5C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,YAAY,CAAC,IAAY;IAEvC,+JAA+J;IAC/J,EAAE;IACF,6DAA6D;IAC7D,2DAA2D;IAC3D,0BAA0B;IAC1B,EAAE;IACF,wFAAwF;IACxF,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC7E,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2CH;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,SAAiC,EAAE,aAAqB,EAAE,YAAqB;IAEzG,IAAG,CAAC,YAAY,KAAK,SAAS,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,EAAE,CAAC;QAEvD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wCAAwC;IACxC,IAAG,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC,EAAE,CAAC;QAExB,4FAA4F;QAC5F,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC;QAE3B,OAAO,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IACpG,CAAC;IAED,mCAAmC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAI,OAAmB,EAAE,OAAe;IAE1E,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAEhG,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,4BAA4B;AAC5B,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,UAAkB;IAE5C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,YAAY,CAAC,IAAY;IAEvC,+JAA+J;IAC/J,EAAE;IACF,6DAA6D;IAC7D,2DAA2D;IAC3D,0BAA0B;IAC1B,EAAE;IACF,wFAAwF;IACxF,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC7E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-plugin-utils",
-  "version": "1.11.1",
+  "version": "1.11.3",
   "displayName": "Homebridge Plugin Utilities",
   "description": "Opinionated utilities to provide common capabilities and create rich configuration webUI experiences for Homebridge plugins.",
   "author": {