mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-16 09:31:20 -04:00
low quality preview for non-drivers
This commit is contained in:
@@ -21,6 +21,7 @@ require('./src/services/videoSessions');
|
||||
require('./src/services/videoAuthService');
|
||||
require('./src/services/videoSocketService');
|
||||
require('./src/services/roomCameraSocketService');
|
||||
require('./src/services/roverSnapshotSocketService');
|
||||
require('./src/services/embedHttpService');
|
||||
require('./src/services/logStreamService');
|
||||
require('./src/services/homeAssistantService');
|
||||
|
||||
@@ -6,6 +6,7 @@ MEDIAMTX_BASE_URL="https://github.com/bluenviron/mediamtx/releases/download/v${M
|
||||
MEDIAMTX_BIN="/usr/local/bin/mediamtx"
|
||||
MEDIAMTX_CONF_DIR="/etc/mediamtx"
|
||||
MEDIAMTX_CONFIG="$MEDIAMTX_CONF_DIR/mediamtx.yml"
|
||||
MEDIAMTX_SNAPSHOT_SCRIPT="$MEDIAMTX_CONF_DIR/rover-snapshot.sh"
|
||||
MEDIAMTX_SERVICE="/etc/systemd/system/mediamtx.service"
|
||||
MULTIROVER_SERVICE="/etc/systemd/system/multirover.service"
|
||||
|
||||
@@ -24,6 +25,7 @@ SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
|
||||
SERVER_DIR="$SCRIPT_DIR"
|
||||
CONFIG_PATH="$SERVER_DIR/config.yaml"
|
||||
MEDIAMTX_TEMPLATE="$SERVER_DIR/mediamtx/mediamtx.yml"
|
||||
MEDIAMTX_SNAPSHOT_TEMPLATE="$SERVER_DIR/mediamtx/rover-snapshot.sh"
|
||||
|
||||
echo "[1/6] Installing dependencies..."
|
||||
dnf install -y nodejs npm curl tar >/dev/null
|
||||
@@ -71,6 +73,13 @@ fi
|
||||
echo " Installing mediaMTX config -> $MEDIAMTX_CONFIG"
|
||||
rm -f "$MEDIAMTX_CONFIG"
|
||||
install -m 0644 "$MEDIAMTX_TEMPLATE" "$MEDIAMTX_CONFIG"
|
||||
if [[ ! -f "$MEDIAMTX_SNAPSHOT_TEMPLATE" ]]; then
|
||||
echo "mediaMTX snapshot script missing at $MEDIAMTX_SNAPSHOT_TEMPLATE" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo " Installing mediaMTX snapshot script -> $MEDIAMTX_SNAPSHOT_SCRIPT"
|
||||
rm -f "$MEDIAMTX_SNAPSHOT_SCRIPT"
|
||||
install -m 0755 "$MEDIAMTX_SNAPSHOT_TEMPLATE" "$MEDIAMTX_SNAPSHOT_SCRIPT"
|
||||
chown -R "$TARGET_USER":"$TARGET_USER" "$MEDIAMTX_CONF_DIR"
|
||||
|
||||
echo "[4/6] Writing systemd units..."
|
||||
|
||||
@@ -41,4 +41,5 @@ authHTTPExclude:
|
||||
paths:
|
||||
all:
|
||||
source: publisher
|
||||
sourceOnDemand: no
|
||||
sourceOnDemand: no
|
||||
runOnReady: /etc/mediamtx/rover-snapshot.sh
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
STREAM_ID="${MTX_PATH:-}"
|
||||
if [[ -z "${STREAM_ID}" ]]; then
|
||||
echo "MTX_PATH is required." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${STREAM_ID}" == *-audio ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
OUTPUT_DIR="${ROVER_SNAPSHOT_DIR:-/run/rover-snapshots}"
|
||||
FPS="${ROVER_SNAPSHOT_FPS:-1}"
|
||||
WIDTH="${ROVER_SNAPSHOT_WIDTH:-640}"
|
||||
QUALITY="${ROVER_SNAPSHOT_QUALITY:-8}"
|
||||
|
||||
mkdir -p "${OUTPUT_DIR}"
|
||||
OUTPUT_PATH="${OUTPUT_DIR}/${STREAM_ID}.jpg"
|
||||
|
||||
INPUT_URL="${ROVER_SNAPSHOT_INPUT_URL:-srt://127.0.0.1:9000?streamid=#!::r=${STREAM_ID},m=play&latency=20&mode=caller&transtype=live&pkt_size=1316}"
|
||||
|
||||
exec /usr/bin/ffmpeg -hide_banner -loglevel warning \
|
||||
-fflags nobuffer \
|
||||
-i "${INPUT_URL}" \
|
||||
-vf "fps=${FPS},scale=${WIDTH}:-1" \
|
||||
-q:v "${QUALITY}" \
|
||||
-an \
|
||||
-f image2 \
|
||||
-update 1 \
|
||||
"${OUTPUT_PATH}"
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -11,7 +11,7 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<meta name="apple-mobile-web-app-title" content="Multi Roomba Rover" />
|
||||
<title>Multi Roomba Rover</title>
|
||||
<script type="module" crossorigin src="/assets/index-DNGguoJu.js"></script>
|
||||
<script type="module" crossorigin src="/assets/index-ClyuL_YR.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-COnIgwcF.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
const EventEmitter = require('events');
|
||||
const fs = require('fs/promises');
|
||||
const path = require('path');
|
||||
const logger = require('../globals/logger').child('roverSnapshot');
|
||||
const roverManager = require('./roverManager');
|
||||
|
||||
const SNAPSHOT_DIR = process.env.ROVER_SNAPSHOT_DIR || '/run/rover-snapshots';
|
||||
const POLL_INTERVAL_MS = 500;
|
||||
|
||||
const roverState = new Map(); // id -> { frame, ts, error, failures, fetching, mtimeMs }
|
||||
const events = new EventEmitter(); // frame, status
|
||||
let pollTimer = null;
|
||||
|
||||
function markState(id, updates = {}) {
|
||||
const prev = roverState.get(id) || {};
|
||||
const next = { ...prev, ...updates };
|
||||
roverState.set(id, next);
|
||||
return next;
|
||||
}
|
||||
|
||||
function getSnapshotPath(id) {
|
||||
return path.join(SNAPSHOT_DIR, `${id}.jpg`);
|
||||
}
|
||||
|
||||
async function fetchSnapshot(id) {
|
||||
const state = roverState.get(id);
|
||||
if (state?.fetching) return;
|
||||
markState(id, { fetching: true });
|
||||
try {
|
||||
const filePath = getSnapshotPath(id);
|
||||
const stats = await fs.stat(filePath);
|
||||
if (state?.mtimeMs && stats.mtimeMs <= state.mtimeMs) {
|
||||
return;
|
||||
}
|
||||
const buffer = await fs.readFile(filePath);
|
||||
const ts = stats.mtimeMs || Date.now();
|
||||
markState(id, { frame: buffer, ts, error: null, failures: 0, mtimeMs: stats.mtimeMs });
|
||||
events.emit('frame', { id, buffer, ts });
|
||||
} catch (err) {
|
||||
const failures = (state?.failures || 0) + 1;
|
||||
const message = err.code === 'ENOENT' ? 'Snapshot missing' : err.message;
|
||||
markState(id, { error: message, failures });
|
||||
events.emit('status', { id, error: message });
|
||||
if (failures % 20 === 1) {
|
||||
logger.warn('Snapshot read failed', { id, err: message });
|
||||
}
|
||||
} finally {
|
||||
markState(id, { fetching: false });
|
||||
}
|
||||
}
|
||||
|
||||
function cleanupInactive(activeIds) {
|
||||
roverState.forEach((_, id) => {
|
||||
if (!activeIds.has(id)) {
|
||||
roverState.delete(id);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function stopAll() {
|
||||
if (pollTimer) {
|
||||
clearInterval(pollTimer);
|
||||
pollTimer = null;
|
||||
}
|
||||
roverState.clear();
|
||||
}
|
||||
|
||||
function startAll() {
|
||||
stopAll();
|
||||
pollTimer = setInterval(() => {
|
||||
const roster = roverManager.getRoster();
|
||||
const activeIds = new Set(roster.map((entry) => String(entry.id)));
|
||||
cleanupInactive(activeIds);
|
||||
roster.forEach((entry) => fetchSnapshot(String(entry.id)));
|
||||
}, POLL_INTERVAL_MS);
|
||||
logger.info('Started rover snapshot polling');
|
||||
}
|
||||
|
||||
function getState(id) {
|
||||
const state = roverState.get(id);
|
||||
if (!state) return null;
|
||||
return {
|
||||
frame: state.frame || null,
|
||||
ts: state.ts || null,
|
||||
error: state.error || null,
|
||||
};
|
||||
}
|
||||
|
||||
startAll();
|
||||
|
||||
module.exports = {
|
||||
roverSnapshotEvents: events,
|
||||
getRoverSnapshotState: getState,
|
||||
};
|
||||
@@ -0,0 +1,168 @@
|
||||
const io = require('../globals/io');
|
||||
const logger = require('../globals/logger').child('roverSnapshotSocket');
|
||||
const { getMode, MODES } = require('./modeManager');
|
||||
const { isAdmin, isLockdownAdmin, getRole } = require('./roleService');
|
||||
const roverManager = require('./roverManager');
|
||||
const { roverSnapshotEvents, getRoverSnapshotState } = require('./roverSnapshotService');
|
||||
|
||||
const SUBSCRIBE_LIMIT = 50;
|
||||
const SUBSCRIBE_WINDOW_MS = 10000;
|
||||
const STREAM_INTERVAL_MS = 800;
|
||||
|
||||
function passesMode(socket) {
|
||||
const mode = getMode();
|
||||
if (mode === MODES.LOCKDOWN) {
|
||||
return isLockdownAdmin(socket);
|
||||
}
|
||||
if (mode === MODES.ADMIN) {
|
||||
const role = getRole(socket);
|
||||
return role === 'spectator' || isAdmin(socket);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function canViewSnapshots(socket) {
|
||||
return passesMode(socket);
|
||||
}
|
||||
|
||||
const roverSubscribers = new Map(); // id -> Set(socketId)
|
||||
const socketSubscriptions = new Map(); // socketId -> Set(id)
|
||||
const subscribeBuckets = new Map(); // socketId -> { start, count }
|
||||
const lastSentBySocket = new Map(); // socketId -> Map(roverId -> ts)
|
||||
|
||||
function addSubscription(socket, roverId) {
|
||||
if (!roverSubscribers.has(roverId)) {
|
||||
roverSubscribers.set(roverId, new Set());
|
||||
}
|
||||
roverSubscribers.get(roverId).add(socket.id);
|
||||
|
||||
if (!socketSubscriptions.has(socket.id)) {
|
||||
socketSubscriptions.set(socket.id, new Set());
|
||||
}
|
||||
socketSubscriptions.get(socket.id).add(roverId);
|
||||
}
|
||||
|
||||
function removeSubscription(socketId, roverId) {
|
||||
const bucket = roverSubscribers.get(roverId);
|
||||
if (bucket) {
|
||||
bucket.delete(socketId);
|
||||
if (bucket.size === 0) {
|
||||
roverSubscribers.delete(roverId);
|
||||
}
|
||||
}
|
||||
const socketBucket = socketSubscriptions.get(socketId);
|
||||
if (socketBucket) {
|
||||
socketBucket.delete(roverId);
|
||||
if (socketBucket.size === 0) {
|
||||
socketSubscriptions.delete(socketId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function removeAllSubscriptions(socketId) {
|
||||
const bucket = socketSubscriptions.get(socketId);
|
||||
if (!bucket) return;
|
||||
bucket.forEach((roverId) => removeSubscription(socketId, roverId));
|
||||
}
|
||||
|
||||
function allowSubscribe(socketId) {
|
||||
const now = Date.now();
|
||||
let bucket = subscribeBuckets.get(socketId);
|
||||
if (!bucket || now - bucket.start >= SUBSCRIBE_WINDOW_MS) {
|
||||
bucket = { start: now, count: 0 };
|
||||
}
|
||||
bucket.count += 1;
|
||||
subscribeBuckets.set(socketId, bucket);
|
||||
return bucket.count <= SUBSCRIBE_LIMIT;
|
||||
}
|
||||
|
||||
function sendFrame(socket, roverId, payload, buffer) {
|
||||
socket.emit('roverSnapshot:frame', { id: roverId, ...payload }, buffer);
|
||||
}
|
||||
|
||||
function sendStatus(socket, roverId, status) {
|
||||
socket.emit('roverSnapshot:status', { id: roverId, ...status });
|
||||
}
|
||||
|
||||
roverSnapshotEvents.on('frame', ({ id, buffer, ts }) => {
|
||||
const bucket = roverSubscribers.get(id);
|
||||
if (!bucket || !buffer) return;
|
||||
bucket.forEach((socketId) => {
|
||||
const socket = io.sockets.sockets.get(socketId);
|
||||
if (!socket) return;
|
||||
let lastMap = lastSentBySocket.get(socketId);
|
||||
if (!lastMap) {
|
||||
lastMap = new Map();
|
||||
lastSentBySocket.set(socketId, lastMap);
|
||||
}
|
||||
const lastSent = lastMap.get(id) || 0;
|
||||
const now = ts || Date.now();
|
||||
if (now - lastSent < STREAM_INTERVAL_MS) {
|
||||
return;
|
||||
}
|
||||
lastMap.set(id, now);
|
||||
sendFrame(socket, id, { ts }, buffer);
|
||||
});
|
||||
});
|
||||
|
||||
roverSnapshotEvents.on('status', ({ id, error }) => {
|
||||
const bucket = roverSubscribers.get(id);
|
||||
if (!bucket) return;
|
||||
bucket.forEach((socketId) => {
|
||||
const socket = io.sockets.sockets.get(socketId);
|
||||
if (!socket) return;
|
||||
sendStatus(socket, id, { error: error || null });
|
||||
});
|
||||
});
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
socket.on('roverSnapshot:subscribe', (payload = {}, cb = () => {}) => {
|
||||
const list = Array.isArray(payload?.ids)
|
||||
? payload.ids.map(String)
|
||||
: payload?.roverId || payload?.id
|
||||
? [String(payload.roverId || payload.id)]
|
||||
: roverManager.getRoster().map((rover) => rover.id);
|
||||
const uniqueIds = Array.from(new Set(list));
|
||||
try {
|
||||
if (!allowSubscribe(socket.id)) {
|
||||
cb({ error: 'Rate limited' });
|
||||
return;
|
||||
}
|
||||
if (!canViewSnapshots(socket)) {
|
||||
throw new Error('Not authorized for rover snapshots');
|
||||
}
|
||||
const rosterIds = new Set(roverManager.getRoster().map((entry) => String(entry.id)));
|
||||
const validIds = uniqueIds.filter((id) => rosterIds.has(String(id)));
|
||||
validIds.forEach((roverId) => addSubscription(socket, roverId));
|
||||
validIds.forEach((roverId) => {
|
||||
const state = getRoverSnapshotState(roverId);
|
||||
if (state?.frame) {
|
||||
sendFrame(socket, roverId, { ts: state.ts }, state.frame);
|
||||
}
|
||||
sendStatus(socket, roverId, {
|
||||
ts: state?.ts || null,
|
||||
error: state?.error || null,
|
||||
});
|
||||
});
|
||||
cb({ ok: true, subscribed: validIds });
|
||||
} catch (err) {
|
||||
logger.warn('Rover snapshot subscribe failed', { socketId: socket.id, err: err.message });
|
||||
cb({ error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
socket.on('roverSnapshot:unsubscribe', (payload = {}) => {
|
||||
const list = Array.isArray(payload?.ids)
|
||||
? payload.ids.map(String)
|
||||
: payload?.roverId || payload?.id
|
||||
? [String(payload.roverId || payload.id)]
|
||||
: [];
|
||||
list.forEach((roverId) => removeSubscription(socket.id, roverId));
|
||||
});
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
removeAllSubscriptions(socket.id);
|
||||
subscribeBuckets.delete(socket.id);
|
||||
lastSentBySocket.delete(socket.id);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user