homebridge-unifi-protect 6.5.1 → 6.7.0

package/homebridge-ui/public/index.html

@@ -29,7 +29,7 @@
     <div id="deviceInfo">
         <table class="table table-sm table-borderless">
           <tr class="align-center">
-            <td colspan="2" class="m-0 p-2 text-center font-weight-bold">Feature options are applied in prioritized order, from global to device-specific options:<br><i>Global options</i> (lowest priority) &rarr; <i>Protect controller options</i> &rarr; <i>Protect device options</i> (highest priority)</td>
+            <td id="headerInfo" colspan="2" class="m-0 p-2 text-center font-weight-bold"></td>
           </tr>
           <tr class="align-top">
             <td rowspan="3" class="w-25">
@@ -50,7 +50,7 @@
             </td>
             <td>
               <table class="table table-sm table-borderless border-bottom m-0 p-0" id="deviceStatsTable" style="display: none;">
-                <tr>
+                <tr id="deviceStatsHeader">
                     <th style="width: 30%;" class="m-0 p-0"><B>Model<B></th>
                     <th style="width: 25%;" class="m-0 p-0"><B>IP Address</B></th>
                     <th style="width: 20%;" class="m-0 p-0"><B>MAC Address</B></th>
@@ -234,6 +234,17 @@
         // Start with a clean slate.
         controllersTable.innerHTML = "";
 
+        // We haven't configured anything yet - we're done.
+        if(!currentConfig[0]?.controllers?.length) {
+
+          document.getElementById("headerInfo").innerHTML = "Please configure a UniFi Protect controller to access in the main settings tab before configuring feature options."
+          homebridge.hideSpinner();
+          return;
+        }
+
+        // Initialize our informational header.
+        document.getElementById("headerInfo").innerHTML = "Feature options are applied in prioritized order, from global to device-specific options:<br><i>Global options</i> (lowest priority) &rarr; <i>Protect controller options</i> &rarr; <i>Protect device options</i> (highest priority)"
+
         // Enumerate our global options.
         const trGlobal = document.createElement("tr");
 
@@ -342,7 +353,12 @@
 
           devicesTable.innerHTML = "";
 
-          document.getElementById("device_model").innerHTML = "Unable to connect to the Protect controller. Check your settings for this controller in the settings tab."
+          document.getElementById("device_model").innerHTML = "Unable to connect to the Protect controller. Check your settings for this controller in the main settings tab to verify they are correct."
+          document.getElementById("device_model").colSpan = 3;
+          document.getElementById("device_model").style.fontWeight = "bold";
+          document.getElementById("device_model").classList.add("text-center");
+          document.getElementById("deviceStatsHeader").style.display = "none";
+
           document.getElementById("device_mac").innerHTML = "";
           document.getElementById("device_address").innerHTML = "";
           document.getElementById("device_online").innerHTML = "";
@@ -421,10 +437,21 @@
         }
 
         const configTable = document.getElementById("configTable");
-        let configOptions = currentConfig[0].options || [];
+        let configOptions = [];
+        let optionsList = [];
+
+        // Update our configuration options.
+        const updateConfigOptions = (newConfig) => {
+
+          // Update our configuration.
+          configOptions = newConfig;
 
-        // Show all the valid options configured by the user.
-        optionsList = configOptions.filter(x => x.match(/^(Enable|Disable)\.*/gi)).map(x => x.toUpperCase());
+          // Show all the valid options configured by the user.
+          optionsList = configOptions.filter(x => x.match(/^(Enable|Disable)\.*/gi)).map(x => x.toUpperCase());
+        };
+
+        // Initialize our feature option configuration.
+        updateConfigOptions(currentConfig[0].options ?? [])
 
         // Is a feature option globally enabled?
         const isGlobalOptionEnabled = (featureOption, defaultValue) => {
@@ -435,7 +462,7 @@
           return optionsList.some(x => x === ("ENABLE." + featureOption)) ? true :
             (optionsList.some(x => x === ("DISABLE." + featureOption)) ? false : defaultValue
             );
-        }
+        };
 
         // Is a feature option enabled at the device or controller level.
         const isDeviceOptionEnabled = (featureOption, mac, defaultValue) => {
@@ -447,7 +474,7 @@
           return optionsList.some(x => x === ("ENABLE." + featureOption + "." + mac)) ? true :
             (optionsList.some(x => x === ("DISABLE." + featureOption + "." + mac)) ? false : defaultValue
             );
-        }
+        };
 
         // Show feature option information for a specific device, controller, or globally.
         const showDeviceInfo = async (deviceId) => {
@@ -463,6 +490,10 @@
           // 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(ufpDevice) {
 
+            document.getElementById("deviceStatsHeader").style.display = "";
+            document.getElementById("device_model").classList.remove("text-center");
+            document.getElementById("device_model").colSpan = 1;
+            document.getElementById("device_model").style.fontWeight = "normal";
             document.getElementById("device_model").innerHTML = ufpDevice.marketName ?? ufpDevice.type;
             document.getElementById("device_mac").innerHTML = ufpDevice.mac;
             document.getElementById("device_address").innerHTML = ufpDevice.host ?? (ufpDevice.modelKey === "sensor" ? "Bluetooth Device" : "None");
@@ -473,6 +504,10 @@
 
             document.getElementById("deviceStatsTable").style.display = "none";
 
+            document.getElementById("deviceStatsHeader").style.display = "";
+            document.getElementById("device_model").classList.remove("text-center");
+            document.getElementById("device_model").colSpan = 1;
+            document.getElementById("device_model").style.fontWeight = "normal";
             document.getElementById("device_model").innerHTML = "N/A"
             document.getElementById("device_mac").innerHTML = "N/A";
             document.getElementById("device_address").innerHTML = "N/A";
@@ -544,7 +579,7 @@
               checkbox.type = "checkbox";
               checkbox.id = featureOption;
               checkbox.name = featureOption;
-              checkbox.value = featureOption + (!ufpDevice ? "" : ("." + ufpDevice.mac)); // LEFT OFF HERE
+              checkbox.value = featureOption + (!ufpDevice ? "" : ("." + ufpDevice.mac));
               checkbox.checked = !ufpDevice ? isGlobalOptionEnabled(featureOption, option.default) :
                 isDeviceOptionEnabled(featureOption, ufpDevice.mac, option.default);
 
@@ -571,7 +606,7 @@
 
                 // Update our configuration in Homebridge.
                 currentConfig[0].options = newOptions;
-                configOptions = newOptions;
+                updateConfigOptions(newOptions);
                 await homebridge.updatePluginConfig(currentConfig);
               });
 

package/homebridge-ui/server.js

@@ -129,6 +129,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
 
     // Compatibility for older versions of the Homebridge UI.
     this.onRequest("/getCachedAccessories", async () => {
+
       try {
 
         // Define the plugin and create the array to return.
@@ -159,6 +160,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
         return [];
       }
     });
+
     this.ready();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-unifi-protect",
-  "version": "6.5.1",
+  "version": "6.7.0",
   "displayName": "Homebridge UniFi Protect",
   "description": "Homebridge UniFi Protect plugin providing complete HomeKit integration for the UniFi Protect ecosystem with full support for most features including autoconfiguration, motion detection, multiple controllers, and realtime updates.",
   "author": {
@@ -68,18 +68,18 @@
     "@homebridge/plugin-ui-utils": "^0.0.19",
     "ffmpeg-for-homebridge": "^0.1.4",
     "mqtt": "4.3.7",
-    "unifi-protect": "^4.2.2",
+    "unifi-protect": "^4.2.3",
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@types/node": "^18.16.3",
+    "@types/node": "^20.2.1",
     "@types/ws": "^8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
-    "eslint": "^8.39.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.6",
+    "@typescript-eslint/parser": "^5.59.6",
+    "eslint": "^8.41.0",
     "homebridge": "=1.6.1",
     "nodemon": "^2.0.22",
-    "rimraf": "^5.0.0",
+    "rimraf": "^5.0.1",
     "typescript": "^5.0.4"
   }
 }