homebridge-unifi-protect 6.13.1 → 6.15.0

package/dist/settings.js

@@ -16,8 +16,12 @@ export const PROTECT_API_TIMEOUT = 3.5;
 export const PROTECT_CONTROLLER_REFRESH_INTERVAL = 120;
 // How often, in seconds, should we retry getting our bootstrap configuration from the Protect controller.
 export const PROTECT_CONTROLLER_RETRY_INTERVAL = 10;
-// Default duration, in milliseconds, of a physical digital chime attached to a Protect doorbell.
+// Default delay, in seconds, before removing Protect devices that no longer exist.
+export const PROTECT_DEVICE_REMOVAL_DELAY_INTERVAL = 60;
+// Default duration, in milliseconds, of a physical digital chime attached to a Protect doorbell. This value comes from UniFi Protect itself.
 export const PROTECT_DOORBELL_CHIME_DURATION_DIGITAL = 1000;
+// Default duration, in milliseconds, of the trigger switch for a Protect doorbell, primarily for automation purposes.
+export const PROTECT_DOORBELL_TRIGGER_DURATION = 5000;
 // FFmpeg afftdn audio filter defaults - this setting uses FFTs to reduce noise in an audio signal by the number of decibels below.
 export const PROTECT_FFMPEG_AUDIO_FILTER_FFTNR = 90;
 // FFmpeg highpass audio filter defaults - this setting attenuates (eliminates) frequencies below the value.
@@ -48,8 +52,6 @@ export const PROTECT_MQTT_RECONNECT_INTERVAL = 60;
 export const PROTECT_MQTT_TOPIC = "unifi/protect";
 // Default duration, in seconds, of occupancy events.
 export const PROTECT_OCCUPANCY_DURATION = 300;
-// Default duration, in seconds, of ring events.
-export const PROTECT_RING_DURATION = 3;
 // Minimum required GPU memory on a Raspberry Pi for hardware acceleration.
 export const PROTECT_RPI_GPU_MINIMUM = 128;
 // Maximum age of a snapshot in seconds.

package/dist/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,0BAA0B;AAC1B,MAAM,CAAC,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAEtD,mCAAmC;AACnC,MAAM,CAAC,MAAM,aAAa,GAAG,eAAe,CAAC;AAE7C,oGAAoG;AACpG,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C,4HAA4H;AAC5H,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAE9C,yFAAyF;AACzF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAEvC,yFAAyF;AACzF,MAAM,CAAC,MAAM,mCAAmC,GAAG,GAAG,CAAC;AAEvD,0GAA0G;AAC1G,MAAM,CAAC,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAEpD,iGAAiG;AACjG,MAAM,CAAC,MAAM,uCAAuC,GAAG,IAAI,CAAC;AAE5D,mIAAmI;AACnI,MAAM,CAAC,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAEpD,4GAA4G;AAC5G,MAAM,CAAC,MAAM,oCAAoC,GAAG,GAAG,CAAC;AAExD,2GAA2G;AAC3G,MAAM,CAAC,MAAM,mCAAmC,GAAG,IAAI,CAAC;AAExD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAEzC,oGAAoG;AACpG,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAEhD,yHAAyH;AACzH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAE/C,mJAAmJ;AACnJ,MAAM,CAAC,MAAM,uCAAuC,GAAG,2BAA2B,GAAG,CAAC,CAAC;AAEvF,kKAAkK;AAClK,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD,+IAA+I;AAC/I,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,mEAAmE;AACnE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAE9C,wJAAwJ;AACxJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAE/C,0HAA0H;AAC1H,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C,oGAAoG;AACpG,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,CAAC;AAElD,uGAAuG;AACvG,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,qDAAqD;AACrD,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAE9C,gDAAgD;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC,2EAA2E;AAC3E,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAE3C,wCAAwC;AACxC,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AAEhD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,uCAAuC,GAAG,EAAE,CAAC;AAE1D,6JAA6J;AAC7J,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,0BAA0B;AAC1B,MAAM,CAAC,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAEtD,mCAAmC;AACnC,MAAM,CAAC,MAAM,aAAa,GAAG,eAAe,CAAC;AAE7C,oGAAoG;AACpG,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C,4HAA4H;AAC5H,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAE9C,yFAAyF;AACzF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAEvC,yFAAyF;AACzF,MAAM,CAAC,MAAM,mCAAmC,GAAG,GAAG,CAAC;AAEvD,0GAA0G;AAC1G,MAAM,CAAC,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAEpD,mFAAmF;AACnF,MAAM,CAAC,MAAM,qCAAqC,GAAG,EAAE,CAAC;AAExD,6IAA6I;AAC7I,MAAM,CAAC,MAAM,uCAAuC,GAAG,IAAI,CAAC;AAE5D,sHAAsH;AACtH,MAAM,CAAC,MAAM,iCAAiC,GAAG,IAAI,CAAC;AAEtD,mIAAmI;AACnI,MAAM,CAAC,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAEpD,4GAA4G;AAC5G,MAAM,CAAC,MAAM,oCAAoC,GAAG,GAAG,CAAC;AAExD,2GAA2G;AAC3G,MAAM,CAAC,MAAM,mCAAmC,GAAG,IAAI,CAAC;AAExD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAEzC,oGAAoG;AACpG,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAEhD,yHAAyH;AACzH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAE/C,mJAAmJ;AACnJ,MAAM,CAAC,MAAM,uCAAuC,GAAG,2BAA2B,GAAG,CAAC,CAAC;AAEvF,kKAAkK;AAClK,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD,+IAA+I;AAC/I,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,mEAAmE;AACnE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAE9C,wJAAwJ;AACxJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAE/C,0HAA0H;AAC1H,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C,oGAAoG;AACpG,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,CAAC;AAElD,uGAAuG;AACvG,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,qDAAqD;AACrD,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAE9C,2EAA2E;AAC3E,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAE3C,wCAAwC;AACxC,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AAEhD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,uCAAuC,GAAG,EAAE,CAAC;AAE1D,6JAA6J;AAC7J,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,CAAC"}

package/homebridge-ui/public/index.html

@@ -160,4 +160,15 @@
     </li>
   </ul>
 </div>
-<script src="./ui.mjs" type="module"></script>
+<noscript>
+  <h2>A JavaScript-enabled web browser is required to use this webUI.</h2>
+</noscript>
+<script>
+  <!--
+  (async () => {
+
+    // We use dynamic imports because web browsers often attempt to cache modules and we always want to pull a fresh copy, in case they've been updated.
+    await import("./ui.mjs");
+  })();
+  // -->
+</script>

package/homebridge-ui/public/lib/featureoptions.mjs

@@ -64,7 +64,8 @@ export class FeatureOptions {
 
     const optionRegex = new RegExp("^Enable\\." + featureOption + (!deviceMac ? "" : "\\." + deviceMac) + "\\.([^\\.]+)$", "gi");
 
-    return this.optionsList.filter(x => optionRegex.test(x)).length ? true : false;
+
+    return this.optionsList.some(x => optionRegex.test(x));
   }
 
   // Get the value of a value-centric feature option.

package/homebridge-ui/public/protect-featureoptions.mjs

@@ -4,9 +4,8 @@
  */
 "use strict";
 
-import { FeatureOptions} from "./lib/featureoptions.mjs";
-
-export class ProtectFeatureOptions extends FeatureOptions {
+// Protect-specific customizations for my feature option framework. We import in this odd way to dodge browser caches.
+export class ProtectFeatureOptions extends (await import("./lib/featureoptions.mjs")).FeatureOptions {
 
   // The current plugin configuration.
   currentConfig;
@@ -370,7 +369,7 @@ export class ProtectFeatureOptions extends FeatureOptions {
     for(const category of ufpFeatures.categories) {
 
       // Only show feature option categories that are valid for this context.
-      if(ufpDevice && (ufpDevice.modelKey !== "nvr") && !category.validFor.some(x => (x === ufpDevice.modelKey) || x === "all")) {
+      if(ufpDevice && (ufpDevice.modelKey !== "nvr") && !category.modelKey.some(x => (x === ufpDevice.modelKey) || x === "all")) {
 
         continue;
       }
@@ -408,8 +407,11 @@ export class ProtectFeatureOptions extends FeatureOptions {
       for(const option of optionsDevice[category.name]) {
 
         // Only show feature options that are valid for this device.
-        if(ufpDevice && (ufpDevice.modelKey !== "nvr") && ((option.hasFeature && (!ufpDevice.featureFlags || !option.hasFeature.some(x => ufpDevice.featureFlags[x]))) ||
-          (option.hasProperty && !option.hasProperty.some(x => x in ufpDevice)))) {
+        if(ufpDevice && (ufpDevice.modelKey !== "nvr") && (
+          (option.hasFeature && (!ufpDevice.featureFlags || !option.hasFeature.some(x => ufpDevice.featureFlags[x]))) ||
+          (option.hasProperty && !option.hasProperty.some(x => x in ufpDevice)) ||
+          (option.modelKey && (option.modelKey !== "all") && !option.modelKey.includes(ufpDevice.modelKey)) ||
+          (option.hasSmartObjectType && ufpDevice.featureFlags?.smartDetectTypes && !option.hasSmartObjectType.some(x => ufpDevice.featureFlags.smartDetectTypes.includes(x))))) {
 
           continue;
         }
@@ -525,7 +527,10 @@ export class ProtectFeatureOptions extends FeatureOptions {
 
             if(checkbox.checked) {
 
-              newOptions.push("Enable." + checkbox.value + "." + inputValue.value);
+              if(inputValue.value.length) {
+
+                newOptions.push("Enable." + checkbox.value + "." + inputValue.value);
+              }
             } 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.

package/homebridge-ui/public/ui.mjs

@@ -4,10 +4,8 @@
  */
 "use strict";
 
-import { ProtectFeatureOptions } from "./protect-featureoptions.mjs";
-
-// Keep a list of all the feature options and option groups.
-const featureOptions = new ProtectFeatureOptions();
+// Keep a list of all the feature options and option groups. We dynamically import our modules to avoid browser caches.
+const featureOptions = new (await import("./protect-featureoptions.mjs")).ProtectFeatureOptions();
 
 // Show the first run user experience if we don't have valid login credentials.
 function showFirstRun () {

package/homebridge-ui/server.js

@@ -36,7 +36,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
   // Register the getErrorMessage() webUI server API endpoint.
   #registerGetErrorMessage() {
 
-    // Return the list of Protect devices.
+    // Return the most recent error message generated by the Protect API.
     this.onRequest("/getErrorMessage", async () => {
 
       try {
@@ -66,11 +66,18 @@ class PluginUiServer extends HomebridgePluginUiServer {
           error: (message, parameters = []) => {
 
             // Save the error to inform the user in the webUI.
-            this.errorInfo = util.format(message, ...parameters);
-            console.log(this.errorInfo);
+            if(!!parameters?.[Symbol.iterator]) {
+
+              this.errorInfo = util.format(message, ...parameters);
+            } else {
+
+              this.errorInfo = util.format(message, parameters);
+            }
+
+            console.error(this.errorInfo);
           },
           info: (message, parameters) => {},
-          warn: (message, parameters = []) => console.log(util.format(message, ...parameters))
+          warn: (message, parameters = []) => {}
         };
 
         // Connect to the Protect controller.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-unifi-protect",
-  "version": "6.13.1",
+  "version": "6.15.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": {
@@ -76,21 +76,21 @@
   "main": "dist/index.js",
   "dependencies": {
     "@homebridge/plugin-ui-utils": "0.1.0",
-    "ffmpeg-for-homebridge": "0.1.4",
-    "mqtt": "5.0.3",
-    "unifi-protect": "4.6.1",
-    "ws": "8.13.0"
+    "ffmpeg-for-homebridge": "2.1.0",
+    "mqtt": "5.0.5",
+    "unifi-protect": "4.7.0",
+    "ws": "8.14.2"
   },
   "devDependencies": {
-    "@types/node": "20.5.6",
-    "@types/readable-stream": "4.0.2",
-    "@types/ws": "8.5.5",
-    "@typescript-eslint/eslint-plugin": "6.4.1",
-    "@typescript-eslint/parser": "6.4.1",
-    "eslint": "8.48.0",
+    "@types/node": "20.8.0",
+    "@types/readable-stream": "4.0.3",
+    "@types/ws": "8.5.6",
+    "@typescript-eslint/eslint-plugin": "6.7.3",
+    "@typescript-eslint/parser": "6.7.3",
+    "eslint": "8.50.0",
     "homebridge": "1.6.1",
     "nodemon": "3.0.1",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "typescript": "5.2.2"
   }
 }