homebridge-ratgdo 2.1.3 → 2.2.0

package/homebridge-ui/public/{ratgdo-featureoptions.mjs → lib/webui-featureoptions.mjs}

@@ -1,37 +1,47 @@
 /* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
  *
- * ratgdo-featureoptions.mjs: Ratgdo feature option webUI.
+ * webui-featureoptions.mjs: Device feature option webUI.
  */
 "use strict";
 
-import { FeatureOptions} from "./lib/featureoptions.mjs";
+import { FeatureOptions} from "./featureoptions.js";
 
-export class ratgdoFeatureOptions extends FeatureOptions {
+export class webUiFeatureOptions {
 
   // The current plugin configuration.
   currentConfig;
 
-  // Current configuration options selected in the webUI for a given device.
-  #configOptions;
-
   // Table containing the currently displayed feature options.
   #configTable;
 
-  // Current list of devices on a given controller, for webUI elements.
-  #deviceList;
+  // The current controller context.
+  #controller;
+
+  // Current list of devices from the Homebridge accessory cache.
+  #devices;
 
-  // Current list of Ratgdo devices from the Homebridge accessory cache.
-  #ratgdoDevices;
+  // Feature options instance.
+  #featureOptions;
 
-  constructor() {
+  // Device sidebar category name.
+  #sidebar;
 
-    super();
+  // Enable the use of controllers.
+  #useControllers;
+
+  // Current list of devices on a given controller, for webUI elements.
+  #webuiDeviceList;
+
+  constructor({ sidebar = "Devices", useControllers = true } = {}) {
 
-    this.configOptions = [];
     this.configTable = document.getElementById("configTable");
+    this.controller = null;
     this.currentConfig = [];
-    this.deviceList = [];
-    this.ratgdoDevices = [];
+    this.devices = [];
+    this.featureOptions = null;
+    this.sidebarName = sidebar;
+    this.useControllers = useControllers;
+    this.webuiDeviceList = [];
   }
 
   // Render the feature option webUI.
@@ -44,6 +54,12 @@ export class ratgdoFeatureOptions extends FeatureOptions {
     // Make sure we have the refreshed configuration.
     this.currentConfig = await homebridge.getPluginConfig();
 
+    // Retrieve the set of feature options available to us.
+    const features = (await homebridge.request("/getOptions")) ?? [];
+
+    // Initialize our feature option configuration.
+    this.featureOptions = new FeatureOptions(features.categories, features.options, this.currentConfig[0].options ?? []);
+
     // Create our custom UI.
     document.getElementById("menuHome").classList.remove("btn-elegant");
     document.getElementById("menuHome").classList.add("btn-primary");
@@ -66,18 +82,18 @@ export class ratgdoFeatureOptions extends FeatureOptions {
     controllersTable.innerHTML = "";
     document.getElementById("devicesTable").innerHTML = "";
     this.configTable.innerHTML = "";
-    this.deviceList = [];
+    this.webuiDeviceList = [];
 
     // Hide the UI until we're ready.
     document.getElementById("sidebar").style.display = "none";
     document.getElementById("headerInfo").style.display = "none";
     document.getElementById("deviceStatsTable").style.display = "none";
 
-    // Get the list of devices the plugin knows about.
-    const ratgdoDevices = await homebridge.getCachedAccessories();
-
     // Initialize our informational header.
-    document.getElementById("headerInfo").innerHTML = "Feature options are applied in prioritized order, from global to device-specific options:<br><i class=\"text-warning\">Global options</i> (lowest priority) &rarr; <i class=\"text-info\">Ratgdo device options</i> (highest priority)";
+    document.getElementById("headerInfo").innerHTML = "Feature options are applied in prioritized order, from global to device-specific options:" +
+      "<br><i class=\"text-warning\">Global options</i> (lowest priority) &rarr; " +
+      (this.useControllers ? "<i class=\"text-success\">Controller options</i> &rarr; " : "") +
+      "<i class=\"text-info\">Device options</i> (highest priority)";
 
     // Enumerate our global options.
     const trGlobal = document.createElement("tr");
@@ -94,7 +110,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
     globalLabel.style.cursor = "pointer";
     globalLabel.classList.add("mx-2", "my-0", "p-0", "w-100");
 
-    globalLabel.addEventListener("click", event => this.#showDevices(true));
+    globalLabel.addEventListener("click", () => this.#showDevices(true));
 
     // Add the global options label.
     tdGlobal.appendChild(globalLabel);
@@ -107,7 +123,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
     controllersTable.appendChild(trGlobal);
 
     // Add it as another device, for UI purposes.
-    this.deviceList.push(globalLabel);
+    this.webuiDeviceList.push(globalLabel);
 
     // All done. Let the user interact with us.
     homebridge.hideSpinner();
@@ -123,18 +139,19 @@ export class ratgdoFeatureOptions extends FeatureOptions {
     homebridge.showSpinner();
 
     const devicesTable = document.getElementById("devicesTable");
-    this.ratgdoDevices = [];
+    this.devices = [];
 
     // If we're not accessing global options, pull the list of devices this plugin knows about from Homebridge.
-    this.ratgdoDevices = (await homebridge.getCachedAccessories()).map(x => ({
+    this.devices = (await homebridge.getCachedAccessories()).map(x => ({
       firmwareVersion: (x.services.find(service => service.constructorName ===
         "AccessoryInformation")?.characteristics.find(characteristic => characteristic.constructorName === "FirmwareRevision")?.value ?? ""),
-      mac: (x.services.find(service => service.constructorName ===
-        "AccessoryInformation")?.characteristics.find(characteristic => characteristic.constructorName === "SerialNumber")?.value ?? ""),
-      name: x.displayName }));
+      name: x.displayName,
+      serial: (x.services.find(service => service.constructorName ===
+        "AccessoryInformation")?.characteristics.find(characteristic => characteristic.constructorName === "SerialNumber")?.value ?? "")
+    }));
 
     // Sort it for posterity.
-    this.ratgdoDevices?.sort((a, b) => {
+    this.devices?.sort((a, b) => {
 
       const aCase = (a.name ?? "").toLowerCase();
       const bCase = (b.name ?? "").toLowerCase();
@@ -147,16 +164,13 @@ export class ratgdoFeatureOptions extends FeatureOptions {
     document.getElementById("headerInfo").style.display = "";
 
     // Wipe out the device list, except for our global entry.
-    this.deviceList.splice(1, this.deviceList.length);
-
-    // We aren't using the concept of a controller category in Ratgdo, so we set this to something innocuous.
-    this.controller = "NA";
+    this.webuiDeviceList.splice(1, this.webuiDeviceList.length);
 
     // Start with a clean slate.
     devicesTable.innerHTML = "";
 
     // Show the devices list only if we have actual devices to show.
-    if(this.ratgdoDevices?.length) {
+    if(this.devices?.length) {
 
       // Create a row for this device category.
       const trCategory = document.createElement("tr");
@@ -166,7 +180,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
       tdCategory.classList.add("m-0", "p-0");
 
       // Add the category name, with appropriate casing.
-      tdCategory.appendChild(document.createTextNode("Ratgdo Devices"));
+      tdCategory.appendChild(document.createTextNode(this.sidebarName));
       tdCategory.style.fontWeight = "bold";
 
       // Add the cell to the table row.
@@ -175,7 +189,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
       // Add the table row to the table.
       devicesTable.appendChild(trCategory);
 
-      for(const device of this.ratgdoDevices) {
+      for(const device of this.devices) {
 
         // Create a row for this device.
         const trDevice = document.createElement("tr");
@@ -187,12 +201,12 @@ export class ratgdoFeatureOptions extends FeatureOptions {
 
         const label = document.createElement("label");
 
-        label.name = device.mac;
-        label.appendChild(document.createTextNode(device.name ?? "Ratgdo"));
+        label.name = device.serial;
+        label.appendChild(document.createTextNode(device.name ?? "Unknown"));
         label.style.cursor = "pointer";
         label.classList.add("mx-2", "my-0", "p-0", "w-100");
 
-        label.addEventListener("click", event => this.#showDeviceInfo(device.mac));
+        label.addEventListener("click", () => this.#showDeviceInfo(device.serial));
 
         // Add the device label to our cell.
         tdDevice.appendChild(label);
@@ -203,92 +217,47 @@ export class ratgdoFeatureOptions extends FeatureOptions {
         // Add the table row to the table.
         devicesTable.appendChild(trDevice);
 
-        this.deviceList.push(label);
+        this.webuiDeviceList.push(label);
       }
     }
 
-    this.configOptions = [];
-
-    // Initialize our feature option configuration.
-    this.#updateConfigOptions(this.currentConfig[0].options ?? []);
-
     // Display the feature options to the user.
-    this.#showDeviceInfo(isGlobal ? "Global Options" : this.ratgdoDevices[0].mac);
+    this.#showDeviceInfo(isGlobal ? "Global Options" : this.devices[0].serial);
 
     // All done. Let the user interact with us.
     homebridge.hideSpinner();
   }
 
-  // Return the serial number of a given Ratgdo device.
-  getSerial(device) {
-
-    return !device ? undefined :
-      device.services.find(x => x.constructorName === "AccessoryInformation")?.characteristics.find(x => x.constructorName === "SerialNumber")?.value ?? "";
-  }
-
   // Show feature option information for a specific device, controller, or globally.
   async #showDeviceInfo(deviceId) {
 
     homebridge.showSpinner();
 
     // Update the selected device for visibility.
-    this.deviceList.map(x => (x.name === deviceId) ? x.parentElement.classList.add("bg-info", "text-white") : x.parentElement.classList.remove("bg-info", "text-white"));
+    this.webuiDeviceList.map(x => (x.name === deviceId) ?
+      x.parentElement.classList.add("bg-info", "text-white") : x.parentElement.classList.remove("bg-info", "text-white"));
 
     // Populate the device information info pane.
-    const ratgdoDevice = this.ratgdoDevices.find(x => x.mac === deviceId);
+    const currentDevice = this.devices.find(x => x.serial === deviceId);
+    this.controller = currentDevice?.serial;
 
     // Ensure we have a controller or device. The only time this won't be the case is when we're looking at global options.
-    if(ratgdoDevice) {
+    if(currentDevice) {
 
-      document.getElementById("device_firmware").innerHTML = ratgdoDevice.firmwareVersion;
-      document.getElementById("device_serial").innerHTML = ratgdoDevice.mac;
+      document.getElementById("device_firmware").innerHTML = currentDevice.firmwareVersion;
+      document.getElementById("device_serial").innerHTML = currentDevice.serial;
       document.getElementById("deviceStatsTable").style.display = "";
     } else {
 
       document.getElementById("deviceStatsTable").style.display = "none";
-      document.getElementById("device_firmware").innerHTML = "N/A"
+      document.getElementById("device_firmware").innerHTML = "N/A";
       document.getElementById("device_serial").innerHTML = "N/A";
     }
 
-    // Populate the feature options selected for this device.
-    const ratgdoFeatures = (await homebridge.request("/getOptions", { configOptions: this.configOptions, ratgdoDevice: ratgdoDevice })) ?? [];
-    const optionsDevice = ratgdoFeatures.options;
-
     // Start with a clean slate.
-    let newConfigTableHtml = "";
     this.configTable.innerHTML = "";
 
-    // Initialize the full list of options.
-    this.featureOptionList = {};
-    this.featureOptionGroups = {};
-
-    for(const category of ratgdoFeatures.categories) {
-
-      // Now enumerate all the feature options for a given device and add then to the full list.
-      for(const option of optionsDevice[category.name]) {
-
-        const featureOption = category.name + (option.name.length ? ("." + option.name): "");
-
-        // Add it to our full list.
-        this.featureOptionList[featureOption] = option;
-
-        // Cross reference the feature option group it belongs to, if any.
-        if(option.group !== undefined) {
-
-          const expandedGroup = category.name + (option.group.length ? ("." + option.group): "");
-
-          // Initialize the group entry if needed.
-          if(!this.featureOptionGroups[expandedGroup]) {
-
-            this.featureOptionGroups[expandedGroup] = [];
-          }
-
-          this.featureOptionGroups[expandedGroup].push(featureOption);
-        }
-      }
-    }
-
-    for(const category of ratgdoFeatures.categories) {
+    for(const category of this.featureOptions.categories) {
 
       const optionTable = document.createElement("table");
       const thead = document.createElement("thead");
@@ -304,7 +273,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
       tbody.classList.add("table-bordered");
 
       // Add the feature option category description.
-      th.appendChild(document.createTextNode(category.description + (!ratgdoDevice ? " (Global)" : " (Device-specific)")));
+      th.appendChild(document.createTextNode(category.description + (!currentDevice ? " (Global)" : " (Device-specific)")));
 
       // Add the table header to the row.
       trFirst.appendChild(th);
@@ -319,10 +288,10 @@ export class ratgdoFeatureOptions extends FeatureOptions {
       let optionsVisibleCount = 0;
 
       // Now enumerate all the feature options for a given device.
-      for(const option of optionsDevice[category.name]) {
+      for(const option of this.featureOptions.options[category.name]) {
 
         // Expand the full feature option.
-        const featureOption = category.name + (option.name.length ? ("." + option.name): "");
+        const featureOption = this.featureOptions.expandOption(category, option);
 
         // Create the next table row.
         const trX = document.createElement("tr");
@@ -339,27 +308,27 @@ export class ratgdoFeatureOptions extends FeatureOptions {
         checkbox.readOnly = false;
         checkbox.id = featureOption;
         checkbox.name = featureOption;
-        checkbox.value = featureOption + (!ratgdoDevice ? "" : ("." + ratgdoDevice.mac));
+        checkbox.value = featureOption + (!currentDevice ? "" : ("." + currentDevice.serial));
 
         let initialValue = undefined;
         let initialScope;
 
         // Determine our initial option scope to show the user what's been set.
-        switch(initialScope = this.optionScope(featureOption, ratgdoDevice?.mac, option.default, ("defaultValue" in option))) {
+        switch(initialScope = this.featureOptions.scope(featureOption, currentDevice?.serial)) {
 
           case "global":
           case "controller":
 
             // If we're looking at the global scope, show the option value. Otherwise, we show that we're inheriting a value from the scope above.
-            if(!ratgdoDevice) {
+            if(!currentDevice) {
 
-              if("defaultValue" in option) {
+              if(this.featureOptions.isValue(featureOption)) {
 
-                checkbox.checked = this.isOptionValueSet(featureOption);
-                initialValue = this.getOptionValue(checkbox.id);
+                checkbox.checked = this.featureOptions.exists(featureOption);
+                initialValue = this.featureOptions.value(checkbox.id);
               } else {
 
-                checkbox.checked = this.isGlobalOptionEnabled(featureOption, option.default);
+                checkbox.checked = this.featureOptions.test(featureOption);
               }
 
               if(checkbox.checked) {
@@ -369,9 +338,9 @@ export class ratgdoFeatureOptions extends FeatureOptions {
 
             } else {
 
-              if("defaultValue" in option) {
+              if(this.featureOptions.isValue(featureOption)) {
 
-                initialValue = this.getOptionValue(checkbox.id, (initialScope === "controller") ? this.controller : undefined);
+                initialValue = this.featureOptions.value(checkbox.id, (initialScope === "controller") ? this.controller : undefined);
               }
 
               checkbox.readOnly = checkbox.indeterminate = true;
@@ -383,13 +352,13 @@ export class ratgdoFeatureOptions extends FeatureOptions {
           case "none":
           default:
 
-            if("defaultValue" in option) {
+            if(this.featureOptions.isValue(featureOption)) {
 
-              checkbox.checked = this.isOptionValueSet(featureOption, ratgdoDevice?.mac);
-              initialValue = this.getOptionValue(checkbox.id, ratgdoDevice?.mac);
+              checkbox.checked = this.featureOptions.exists(featureOption, currentDevice?.serial);
+              initialValue = this.featureOptions.value(checkbox.id, currentDevice?.serial);
             } else {
 
-              checkbox.checked = this.isDeviceOptionEnabled(featureOption, ratgdoDevice?.mac, option.default);
+              checkbox.checked = this.featureOptions.test(featureOption, currentDevice?.serial);
             }
 
             break;
@@ -411,7 +380,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
         let inputValue = null;
 
         // Add an input field if we have a value-centric feature option.
-        if(("defaultValue" in option)) {
+        if(this.featureOptions.isValue(featureOption)) {
 
           const tdInput = document.createElement("td");
           tdInput.classList.add("mr-2");
@@ -427,8 +396,8 @@ export class ratgdoFeatureOptions extends FeatureOptions {
           inputValue.addEventListener("change", async () => {
 
             // Find the option in our list and delete it if it exists.
-            const optionRegex = new RegExp("^(?:Enable|Disable)\\." + checkbox.id + (!ratgdoDevice ? "" : ("\\." + ratgdoDevice.mac)) + "\\.[^\\.]+$", "gi");
-            const newOptions = this.configOptions.filter(x => !optionRegex.test(x));
+            const optionRegex = new RegExp("^(?:Enable|Disable)\\." + checkbox.id + (!currentDevice ? "" : ("\\." + currentDevice.serial)) + "\\.[^\\.]+$", "gi");
+            const newOptions = this.featureOptions.configuredOptions.filter(x => !optionRegex.test(x));
 
             if(checkbox.checked) {
 
@@ -436,7 +405,9 @@ export class ratgdoFeatureOptions extends FeatureOptions {
             } else if(checkbox.indeterminate) {
 
               // If we're in an indeterminate state, we need to traverse the tree to get the upstream value we're inheriting.
-              inputValue.value = (ratgdoDevice?.mac !== this.controller) ? (this.getOptionValue(checkbox.id, this.controller) ?? this.getOptionValue(checkbox.id)) : (this.getOptionValue(checkbox.id) ?? option.defaultValue);
+              inputValue.value = (currentDevice?.serial !== this.controller) ?
+                (this.featureOptions.value(checkbox.id, this.controller) ?? this.featureOptions.value(checkbox.id)) :
+                (this.featureOptions.value(checkbox.id) ?? option.defaultValue);
             } else {
 
               inputValue.value = option.defaultValue;
@@ -444,7 +415,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
 
             // Update our configuration in Homebridge.
             this.currentConfig[0].options = newOptions;
-            this.#updateConfigOptions(newOptions);
+            this.featureOptions.configuredOptions = newOptions;
             await homebridge.updatePluginConfig(this.currentConfig);
           });
 
@@ -459,7 +430,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
         labelDescription.classList.add("user-select-none", "my-0", "py-0");
 
         // Highlight options for the user that are different than our defaults.
-        const scopeColor = this.optionScopeColor(featureOption, ratgdoDevice?.mac, option.default, ("defaultValue" in option));
+        const scopeColor = this.featureOptions.color(featureOption, currentDevice?.serial);
 
         if(scopeColor) {
 
@@ -470,19 +441,19 @@ export class ratgdoFeatureOptions extends FeatureOptions {
         checkbox.addEventListener("change", async () => {
 
           // Find the option in our list and delete it if it exists.
-          const optionRegex = new RegExp("^(?:Enable|Disable)\\." + checkbox.id + (!ratgdoDevice ? "" : ("\\." + ratgdoDevice.mac)) + "$", "gi");
-          const newOptions = this.configOptions.filter(x => !optionRegex.test(x));
+          const optionRegex = new RegExp("^(?:Enable|Disable)\\." + checkbox.id + (!currentDevice ? "" : ("\\." + currentDevice.serial)) + "$", "gi");
+          const newOptions = this.featureOptions.configuredOptions.filter(x => !optionRegex.test(x));
 
           // Figure out if we've got the option set upstream.
           let upstreamOption = false;
 
           // We explicitly want to check for the scope of the feature option above where we are now, so we can appropriately determine what we should show.
-          switch(this.optionScope(checkbox.id, (ratgdoDevice && (ratgdoDevice.mac !== this.controller)) ? this.controller : null, option.default, ("defaultValue" in option))) {
+          switch(this.featureOptions.scope(checkbox.id, (currentDevice && (currentDevice.serial !== this.controller)) ? this.controller : undefined)) {
 
             case "device":
             case "controller":
 
-              if(ratgdoDevice.mac !== this.controller) {
+              if(currentDevice.serial !== this.controller) {
 
                 upstreamOption = true;
               }
@@ -491,7 +462,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
 
             case "global":
 
-              if(ratgdoDevice) {
+              if(currentDevice) {
 
                 upstreamOption = true;
               }
@@ -503,8 +474,9 @@ export class ratgdoFeatureOptions extends FeatureOptions {
               break;
           }
 
-          // For value-centric feature options, if there's an upstream value assigned above us, we don't allow for an unchecked state as it makes no sense in that context.
-          if(checkbox.readOnly && (!("defaultValue" in option) || (("defaultValue" in option) && inputValue && !upstreamOption))) {
+          // For value-centric feature options, if there's an upstream value assigned above us, we don't allow for an unchecked state as it doesn't make sense in this
+          // context.
+          if(checkbox.readOnly && (!this.featureOptions.isValue(featureOption) || (this.featureOptions.isValue(featureOption) && inputValue && !upstreamOption))) {
 
             // We're truly unchecked. We need this because a checkbox can be in both an unchecked and indeterminate simultaneously,
             // so we use the readOnly property to let us know that we've just cycled from an indeterminate state.
@@ -519,7 +491,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
               checkbox.readOnly = checkbox.indeterminate = true;
             }
 
-            if(("defaultValue" in option) && inputValue) {
+            if(this.featureOptions.isValue(featureOption) && inputValue) {
 
               inputValue.readOnly = true;
             }
@@ -528,7 +500,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
             // We've explicitly checked this option.
             checkbox.readOnly = checkbox.indeterminate = false;
 
-            if(("defaultValue" in option) && inputValue) {
+            if(this.featureOptions.isValue(featureOption) && inputValue) {
 
               inputValue.readOnly = false;
             }
@@ -546,7 +518,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
           }
 
           // Update our Homebridge configuration.
-          if(("defaultValue" in option) && inputValue) {
+          if(this.featureOptions.isValue(featureOption) && inputValue) {
 
             // Inform our value-centric feature option to update Homebridge.
             const changeEvent = new Event("change");
@@ -556,14 +528,14 @@ export class ratgdoFeatureOptions extends FeatureOptions {
 
             // Update our configuration in Homebridge.
             this.currentConfig[0].options = newOptions;
-            this.#updateConfigOptions(newOptions);
+            this.featureOptions.configuredOptions = newOptions;
             await homebridge.updatePluginConfig(this.currentConfig);
           }
 
           // If we've reset to defaults, make sure our color coding for scope is reflected.
           if((checkbox.checked === option.default) || checkbox.indeterminate) {
 
-            const scopeColor = this.optionScopeColor(featureOption, ratgdoDevice?.mac, option.default, ("defaultValue" in option));
+            const scopeColor = this.featureOptions.color(featureOption, currentDevice?.serial);
 
             if(scopeColor) {
 
@@ -572,12 +544,12 @@ export class ratgdoFeatureOptions extends FeatureOptions {
           }
 
           // Adjust visibility of other feature options that depend on us.
-          if(this.featureOptionGroups[checkbox.id]) {
+          if(this.featureOptions.groups[checkbox.id]) {
 
-            const entryVisibility = this.isOptionEnabled(featureOption, ratgdoDevice?.mac) ? "" : "none";
+            const entryVisibility = this.featureOptions.test(featureOption, currentDevice?.serial) ? "" : "none";
 
             // Lookup each feature option setting and set the visibility accordingly.
-            for(const entry of this.featureOptionGroups[checkbox.id]) {
+            for(const entry of this.featureOptions.groups[checkbox.id]) {
 
               document.getElementById("row-" + entry).style.display = entryVisibility;
             }
@@ -597,7 +569,7 @@ export class ratgdoFeatureOptions extends FeatureOptions {
         trX.appendChild(tdLabel);
 
         // Adjust the visibility of the feature option, if it's logically grouped.
-        if((option.group !== undefined) && !this.isOptionEnabled(category.name + (option.group.length ? ("." + option.group): ""), ratgdoDevice?.mac)) {
+        if((option.group !== undefined) && !this.featureOptions.test(category.name + (option.group.length ? ("." + option.group) : ""), currentDevice?.serial)) {
 
           trX.style.display = "none";
         } else {
@@ -625,14 +597,4 @@ export class ratgdoFeatureOptions extends FeatureOptions {
 
     homebridge.hideSpinner();
   }
-
-  // Update our configuration options.
-  #updateConfigOptions(newConfig) {
-
-    // Update our configuration.
-    this.configOptions = newConfig;
-
-    // Show all the valid options configured by the user.
-    this.optionsList = this.configOptions.filter(x => x.match(/^(Enable|Disable)\.*/gi)).map(x => x.toUpperCase());
-  }
 }

package/homebridge-ui/server.js

@@ -1,58 +1,22 @@
 /* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * server.js: homebridge-ratgdo webUI server API.
- *
- * This module is heavily inspired by the homebridge-config-ui-x source code and borrows from both.
- * Thank you oznu for your contributions to the HomeKit world.
  */
 "use strict";
 
-import { featureOptionCategories, featureOptions, isOptionEnabled } from "../dist/ratgdo-options.js";
+import { featureOptionCategories, featureOptions } from "../dist/ratgdo-options.js";
 import { HomebridgePluginUiServer } from "@homebridge/plugin-ui-utils";
-import util from "node:util";
 
 class PluginUiServer extends HomebridgePluginUiServer {
 
-  constructor () {
+  constructor() {
     super();
 
     // Register getOptions() with the Homebridge server API.
-    this.#registerGetOptions();
+    this.onRequest("/getOptions", () => ({ categories: featureOptionCategories, options: featureOptions }));
 
     this.ready();
   }
-
-  // Register the getOptions() webUI server API endpoint.
-  #registerGetOptions() {
-
-    // Return the list of options configured for a given Ratgdo device.
-    this.onRequest("/getOptions", async(request) => {
-
-      try {
-
-        const optionSet = {};
-
-        // Loop through all the feature option categories.
-        for(const category of featureOptionCategories) {
-
-          optionSet[category.name] = [];
-
-          for(const options of featureOptions[category.name]) {
-
-            options.value = isOptionEnabled(request.configOptions, request.ratgdoDevice, category.name + "." + options.name, options.default);
-            optionSet[category.name].push(options);
-          }
-        }
-
-        return { categories: featureOptionCategories, options: optionSet };
-
-      } catch(err) {
-
-        // Return nothing if we error out for some reason.
-        return {};
-      }
-    });
-  }
 }
 
 (() => new PluginUiServer())();