i hate weather

This commit is contained in:
legop3
2026-04-29 15:15:15 -04:00
parent fcfcdc907a
commit ef5c6fab89
5 changed files with 50 additions and 0 deletions
+8
View File
@@ -6,6 +6,7 @@ MEDIAMTX_BASE_URL="https://github.com/bluenviron/mediamtx/releases/download/v${M
MEDIAMTX_BIN="/usr/local/bin/mediamtx" MEDIAMTX_BIN="/usr/local/bin/mediamtx"
MEDIAMTX_CONF_DIR="/etc/mediamtx" MEDIAMTX_CONF_DIR="/etc/mediamtx"
MEDIAMTX_CONFIG="$MEDIAMTX_CONF_DIR/mediamtx.yml" MEDIAMTX_CONFIG="$MEDIAMTX_CONF_DIR/mediamtx.yml"
ROVER_SNAPSHOT_WRITER_BIN="/usr/local/bin/rover-snapshot-writer.sh"
MEDIAMTX_SERVICE="/etc/systemd/system/mediamtx.service" MEDIAMTX_SERVICE="/etc/systemd/system/mediamtx.service"
MULTIROVER_SERVICE="/etc/systemd/system/multirover.service" MULTIROVER_SERVICE="/etc/systemd/system/multirover.service"
SNAPSHOT_DIR="/var/lib/rover-snapshots" SNAPSHOT_DIR="/var/lib/rover-snapshots"
@@ -26,6 +27,7 @@ SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
SERVER_DIR="$SCRIPT_DIR" SERVER_DIR="$SCRIPT_DIR"
CONFIG_PATH="$SERVER_DIR/config.yaml" CONFIG_PATH="$SERVER_DIR/config.yaml"
MEDIAMTX_TEMPLATE="$SERVER_DIR/mediamtx/mediamtx.yml" MEDIAMTX_TEMPLATE="$SERVER_DIR/mediamtx/mediamtx.yml"
ROVER_SNAPSHOT_WRITER_TEMPLATE="$SERVER_DIR/mediamtx/rover-snapshot-writer.sh"
echo "[1/6] Installing dependencies..." echo "[1/6] Installing dependencies..."
dnf install -y nodejs npm curl tar >/dev/null dnf install -y nodejs npm curl tar >/dev/null
@@ -70,9 +72,15 @@ if [[ ! -f "$MEDIAMTX_TEMPLATE" ]]; then
echo "mediaMTX template missing at $MEDIAMTX_TEMPLATE" >&2 echo "mediaMTX template missing at $MEDIAMTX_TEMPLATE" >&2
exit 1 exit 1
fi fi
if [[ ! -f "$ROVER_SNAPSHOT_WRITER_TEMPLATE" ]]; then
echo "Snapshot writer template missing at $ROVER_SNAPSHOT_WRITER_TEMPLATE" >&2
exit 1
fi
echo " Installing mediaMTX config -> $MEDIAMTX_CONFIG" echo " Installing mediaMTX config -> $MEDIAMTX_CONFIG"
rm -f "$MEDIAMTX_CONFIG" rm -f "$MEDIAMTX_CONFIG"
install -m 0644 "$MEDIAMTX_TEMPLATE" "$MEDIAMTX_CONFIG" install -m 0644 "$MEDIAMTX_TEMPLATE" "$MEDIAMTX_CONFIG"
echo " Installing rover snapshot writer -> $ROVER_SNAPSHOT_WRITER_BIN"
install -m 0755 "$ROVER_SNAPSHOT_WRITER_TEMPLATE" "$ROVER_SNAPSHOT_WRITER_BIN"
chown -R "$TARGET_USER":"$TARGET_USER" "$MEDIAMTX_CONF_DIR" chown -R "$TARGET_USER":"$TARGET_USER" "$MEDIAMTX_CONF_DIR"
echo "[4/6] Writing systemd units..." echo "[4/6] Writing systemd units..."
+4
View File
@@ -41,3 +41,7 @@ paths:
all: all:
source: publisher source: publisher
sourceOnDemand: no sourceOnDemand: no
# Rover Snapshot Writer
# Keep rover snapshots continuously updated while a rover video path is live.
runOnReady: /usr/local/bin/rover-snapshot-writer.sh
runOnReadyRestart: yes
+25
View File
@@ -0,0 +1,25 @@
#!/usr/bin/env bash
# Rover Snapshot Writer Hook
# Purpose: Runs under mediaMTX runOnReady to keep per-rover JPEG snapshots updated on disk.
# Scope: Writes only rover video path snapshots and ignores audio/forward/room paths.
set -euo pipefail
PATH_NAME="${MTX_PATH:-}"
SNAP_DIR="${ROVER_SNAPSHOT_DIR:-/var/lib/rover-snapshots}"
# Ignore non-rover-video paths.
case "$PATH_NAME" in
""|*-audio|*-fwd|room/*)
exit 0
;;
esac
mkdir -p "$SNAP_DIR"
exec ffmpeg -hide_banner -loglevel warning \
-i "srt://127.0.0.1:9000?streamid=read:${PATH_NAME}" \
-an \
-vf fps=2 \
-q:v 6 \
-update 1 \
"${SNAP_DIR}/${PATH_NAME}.jpg"
@@ -10,6 +10,7 @@ const SNAPSHOT_DIR = process.env.ROVER_SNAPSHOT_DIR || '/var/lib/rover-snapshots
const POLL_INTERVAL_MS = 300; const POLL_INTERVAL_MS = 300;
const roverState = new Map(); const roverState = new Map();
const events = new EventEmitter(); const events = new EventEmitter();
const readCounts = new Map();
let pollTimer = null; let pollTimer = null;
function markState(id, updates = {}) { function markState(id, updates = {}) {
@@ -35,6 +36,11 @@ function createRoverSnapshotPoller({ roverManager }) {
const buffer = await fs.readFile(filePath); const buffer = await fs.readFile(filePath);
const ts = stats.mtimeMs || Date.now(); const ts = stats.mtimeMs || Date.now();
markState(id, { frame: buffer, ts, error: null, failures: 0, mtimeMs: stats.mtimeMs }); markState(id, { frame: buffer, ts, error: null, failures: 0, mtimeMs: stats.mtimeMs });
const count = (readCounts.get(id) || 0) + 1;
readCounts.set(id, count);
if (count === 1 || count % 30 === 0) {
logger.warn('Snapshot read', { id, count, ts, bytes: buffer.length, mtimeMs: stats.mtimeMs });
}
events.emit('frame', { id, buffer, ts }); events.emit('frame', { id, buffer, ts });
return { frame: buffer, ts }; return { frame: buffer, ts };
} catch (err) { } catch (err) {
@@ -25,6 +25,7 @@ function registerRoverSnapshotSocketGateway({ roverManager, roverSnapshotEvents,
const socketSubscriptions = new Map(); const socketSubscriptions = new Map();
const subscribeBuckets = new Map(); const subscribeBuckets = new Map();
const lastSentBySocket = new Map(); const lastSentBySocket = new Map();
const sentCounts = new Map();
function addSubscription(socket, roverId) { function addSubscription(socket, roverId) {
if (!roverSubscribers.has(roverId)) roverSubscribers.set(roverId, new Set()); if (!roverSubscribers.has(roverId)) roverSubscribers.set(roverId, new Set());
@@ -84,6 +85,12 @@ function registerRoverSnapshotSocketGateway({ roverManager, roverSnapshotEvents,
const now = ts || Date.now(); const now = ts || Date.now();
if (now - lastSent < STREAM_INTERVAL_MS) return; if (now - lastSent < STREAM_INTERVAL_MS) return;
lastMap.set(id, now); lastMap.set(id, now);
const key = `${socketId}:${id}`;
const sentCount = (sentCounts.get(key) || 0) + 1;
sentCounts.set(key, sentCount);
if (sentCount === 1 || sentCount % 30 === 0) {
logger.warn('Snapshot frame sent', { socketId, roverId: id, sentCount, ts, bytes: buffer.length });
}
sendFrame(socket, id, { ts }, buffer); sendFrame(socket, id, { ts }, buffer);
}); });
}); });