Release 5.7.2

devices/base-ring-device.js

@@ -15,7 +15,7 @@ export default class RingDevice {
         }
 
         this.debug = (message, debugType) => {
-            utils.debug(debugType === 'disc' ? message : chalk.green(`[${this.deviceData.name}] `)+message, debugType ? debugType : 'mqtt')
+            utils.debug(debugType === 'disc' ? message : chalk.green(`[${this.deviceData.name}] `)+message, debugType || 'mqtt')
         }
         // Build device base and availability topic
         this.deviceTopic = `${utils.config().ring_topic}/${this.locationId}/${category}/${this.deviceId}`

devices/panic-button.js

@@ -6,15 +6,14 @@ export default class PanicButton extends RingSocketDevice {
         this.deviceData.mdl = 'Panic Button'
 
 
-        // Listen to raw data updates for all devices and pick out
-        // arm/disarm and countdown events for this security panel
+        // Listen to raw data updates for all devices and log any events
         this.device.location.onDataUpdate.subscribe(async (message) => {
             if (!this.isOnline()) { return }
 
             if (message.datatype === 'DeviceInfoDocType' &&
                 message.body?.[0]?.general?.v2?.zid === this.deviceId
             ) {
-                this.debug(JSON.stringify(message))
+                this.debug(JSON.stringify(message), 'data')
             }
         })
 

docs/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v5.7.2
+**Bugs Fixed**
+- Fix a locking issue which prevented live and event streams to be active concurrently on the same camera.
+- Fix an issue with Modes where the incorrect mode was published for a few milliseoncds during startup.  Thanks to @wahflz for the PR to address this!
+
+**Dependency Updates**
+- push-receiver 4.2.0
+- werift 0.20.0
+- express 4.21.0
+- mqtt 5.10.1
+- debug 4.3.7
+
 ## v5.7.1
 **New Features**
 - Add experimental support for Zooz water valves.  This support is currently untested, but was developed using user data dumps kindly contributed from several users and also based on a similar PR submitted for ring-homebridge from another user.  Please feel free to open an issue on the Github project page if you have problems with this device and thanks to all involved for their support.

lib/streaming/streaming-session.js

@@ -2,7 +2,7 @@
 // to native Javascript with custom logging for ring-mqtt and some unused code removed.
 // Much thanks to @dgreif for the original code which is the basis for this work.
 
-import { FfmpegProcess, reservePorts, RtpSplitter, } from '@homebridge/camera-utils'
+import { FfmpegProcess, reservePorts, RtpSplitter } from '@homebridge/camera-utils'
 import { firstValueFrom, ReplaySubject, Subject } from 'rxjs'
 import pathToFfmpeg from 'ffmpeg-for-homebridge'
 import { concatMap, take } from 'rxjs/operators'

package.json

@@ -5,28 +5,26 @@
   "description": "Ring Devices via MQTT",
   "main": "ring-mqtt.js",
   "dependencies": {
-    "aedes": "0.51.2",
-    "body-parser": "^1.20.2",
+    "@homebridge/camera-utils": "^2.2.7-beta",
+    "aedes": "^0.51.3",
+    "body-parser": "^1.20.3",
     "chalk": "^5.3.0",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "debug": "^4.3.7",
-    "express": "^4.21.0",
-    "is-online": "^10.0.0",
+    "express": "^4.21.1",
+    "is-online": "^11.0.0",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
     "mqtt": "^5.10.1",
-    "ring-client-api": "^13.1.0",
+    "ring-client-api": "13.2.0-beta.1",
     "rxjs": "^7.8.1",
-    "werift": "^0.20.0",
-    "write-file-atomic": "^5.0.1"
+    "werift": "^0.20.1",
+    "write-file-atomic": "^6.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
-    "eslint": "^9.11.1",
-    "globals": "^15.9.0"
-  },
-  "overrides": {
-    "@eneris/push-receiver": "4.2.0"
+    "@eslint/js": "^9.13.0",
+    "eslint": "^9.14.0",
+    "globals": "^15.11.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

scripts/update2branch.sh

@@ -39,22 +39,22 @@ else
             ;;
     esac
     rm -f /usr/local/bin/go2rtc
-    #curl -L -s -o /usr/local/bin/go2rtc "https://github.com/AlexxIT/go2rtc/releases/download/${GO2RTC_VERSION}/go2rtc_linux_${GO2RTC_ARCH}"
+#   curl -L -s -o /usr/local/bin/go2rtc "https://github.com/AlexxIT/go2rtc/releases/download/${GO2RTC_VERSION}/go2rtc_linux_${GO2RTC_ARCH}"
     cp "/app/ring-mqtt-${BRANCH}/bin/go2rtc_linux_${GO2RTC_ARCH}" /usr/local/bin/go2rtc
     chmod +x /usr/local/bin/go2rtc
 
-    #case "${APK_ARCH}" in
-    #    x86_64)
-    #        apk del npm nodejs
-    #        apk add libstdc++
-    #        cd /opt
-    #        wget https://unofficial-builds.nodejs.org/download/release/v20.16.0/node-v20.16.0-linux-x64-musl.tar.gz
-    #        mkdir nodejs
-    #        tar -zxvf *.tar.gz --directory /opt/nodejs --strip-components=1
-    #        ln -s /opt/nodejs/bin/node /usr/local/bin/node
-    #        ln -s /opt/nodejs/bin/npm /usr/local/bin/npm
-    #        ;;
-    #esac
+    case "${APK_ARCH}" in
+        x86_64)
+            apk del npm nodejs
+            apk add libstdc++
+            cd /opt
+            wget https://unofficial-builds.nodejs.org/download/release/v22.11.0/node-v22.11.0-linux-x64-musl.tar.gz
+            mkdir nodejs
+            tar -zxvf *.tar.gz --directory /opt/nodejs --strip-components=1
+            ln -s /opt/nodejs/bin/node /usr/local/bin/node
+            ln -s /opt/nodejs/bin/npm /usr/local/bin/npm
+            ;;
+    esac
 
     cp -f "/app/ring-mqtt-${BRANCH}/init/s6/services.d/ring-mqtt/run" /etc/services.d/ring-mqtt/run
     chmod +x /etc/services.d/ring-mqtt/run