legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-16 09:31:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

the great simplification

Browse Source
This commit is contained in:
legop3
2025-12-01 23:28:12 -05:00
parent c7b16d6ddd
commit 2b2b6cbb60
5 changed files with 53 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/public/assets/index-BSwETZ7o.js → server/public/assets/index-D7nzoVy2.js
+8 -8
View File
File diff suppressed because one or more lines are too long
server/public/index.html
+1 -1
View File
@@ -11,7 +11,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="apple-mobile-web-app-title" content="Multi Roomba Rover" /> <meta name="apple-mobile-web-app-title" content="Multi Roomba Rover" />
<title>Multi Roomba Rover</title> <title>Multi Roomba Rover</title>
<script type="module" crossorigin src="/assets/index-BSwETZ7o.js"></script> <script type="module" crossorigin src="/assets/index-D7nzoVy2.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-B1UrCI1T.css"> <link rel="stylesheet" crossorigin href="/assets/index-B1UrCI1T.css">
</head> </head>
<body> <body>
server/src/services/roomCameraSnapshotService.js
+10 -17
View File
@@ -7,8 +7,8 @@ const FETCH_TIMEOUT_MS = 2000;
const STALE_AFTER_MS = 4000; const STALE_AFTER_MS = 4000;
const cameraState = new Map(); // id -> {frame, ts, stale, error, failures, fetching} const cameraState = new Map(); // id -> {frame, ts, stale, error, failures, fetching}
const pollers = new Map();
const events = new EventEmitter(); // frame, status const events = new EventEmitter(); // frame, status
let pollTimer = null;
function markState(id, updates = {}) { function markState(id, updates = {}) {
const prev = cameraState.get(id) || {}; const prev = cameraState.get(id) || {};
@@ -50,28 +50,21 @@ async function fetchSnapshot(camera) {
} }
} }
function startCamera(camera) {
const { id, url } = camera;
if (!url) {
logger.warn('Skipping room camera without URL', { id });
return;
}
if (pollers.has(id)) return;
markState(id, { frame: null, ts: null, error: null, failures: 0, fetching: false });
const poller = setInterval(() => fetchSnapshot(camera), POLL_INTERVAL_MS);
pollers.set(id, poller);
logger.info('Started snapshot polling', { id, url });
}
function stopAll() { function stopAll() {
pollers.forEach((poller) => clearInterval(poller)); if (pollTimer) {
pollers.clear(); clearInterval(pollTimer);
pollTimer = null;
}
cameraState.clear(); cameraState.clear();
} }
function startAll() { function startAll() {
stopAll(); stopAll();
getRoomCameras().forEach((camera) => startCamera(camera)); pollTimer = setInterval(() => {
getRoomCameras().forEach((camera) => fetchSnapshot(camera));
}, POLL_INTERVAL_MS);
getRoomCameras().forEach((camera) => fetchSnapshot(camera));
logger.info('Started snapshot polling', { count: getRoomCameras().length });
} }
function getState(id) { function getState(id) {
server/src/services/roomCameraSocketService.js
+28 -20
View File
@@ -2,7 +2,7 @@ const io = require('../globals/io');
const logger = require('../globals/logger').child('roomCameraSocket'); const logger = require('../globals/logger').child('roomCameraSocket');
const { getMode, MODES } = require('./modeManager'); const { getMode, MODES } = require('./modeManager');
const { isAdmin, isLockdownAdmin, getRole } = require('./roleService'); const { isAdmin, isLockdownAdmin, getRole } = require('./roleService');
const { getRoomCamera } = require('./roomCameraService'); const { getRoomCamera, getRoomCameras } = require('./roomCameraService');
const { roomCameraStreamEvents, getRoomCameraState } = require('./roomCameraSnapshotService'); const { roomCameraStreamEvents, getRoomCameraState } = require('./roomCameraSnapshotService');
const SUBSCRIBE_LIMIT = 50; const SUBSCRIBE_LIMIT = 50;
@@ -104,39 +104,47 @@ roomCameraStreamEvents.on('status', ({ id, error }) => {
io.on('connection', (socket) => { io.on('connection', (socket) => {
socket.on('roomCamera:subscribe', (payload = {}, cb = () => {}) => { socket.on('roomCamera:subscribe', (payload = {}, cb = () => {}) => {
const cameraId = payload.roomCameraId || payload.id; const list = Array.isArray(payload?.ids)
? payload.ids.map(String)
: payload?.roomCameraId || payload?.id
? [String(payload.roomCameraId || payload.id)]
: getRoomCameras().map((cam) => cam.id);
const uniqueIds = Array.from(new Set(list));
try { try {
if (!allowSubscribe(socket.id)) { if (!allowSubscribe(socket.id)) {
cb({ error: 'Rate limited' }); cb({ error: 'Rate limited' });
return; return;
} }
if (!cameraId) {
throw new Error('roomCameraId required');
}
const camera = getRoomCamera(cameraId);
if (!camera) {
throw new Error('Unknown room camera');
}
if (!canViewRoomCamera(socket)) { if (!canViewRoomCamera(socket)) {
throw new Error('Not authorized for room camera'); throw new Error('Not authorized for room camera');
} }
addSubscription(socket, camera.id); const validIds = uniqueIds.filter((id) => !!getRoomCamera(id));
const state = getRoomCameraState(camera.id); validIds.forEach((cameraId) => addSubscription(socket, cameraId));
if (state?.frame) { validIds.forEach((cameraId) => {
sendFrame(socket, camera.id, { ts: state.ts, stale: !!state.stale }, state.frame); const state = getRoomCameraState(cameraId);
} if (state?.frame) {
sendStatus(socket, camera.id, { ts: state?.ts || null, stale: state?.stale ?? true, error: state?.error || null }); sendFrame(socket, cameraId, { ts: state.ts, stale: !!state.stale }, state.frame);
cb({ ok: true }); }
sendStatus(socket, cameraId, {
ts: state?.ts || null,
stale: state?.stale ?? true,
error: state?.error || null,
});
});
cb({ ok: true, subscribed: validIds });
} catch (err) { } catch (err) {
logger.warn('Room camera subscribe failed', { socketId: socket.id, cameraId, err: err.message }); logger.warn('Room camera subscribe failed', { socketId: socket.id, err: err.message });
cb({ error: err.message }); cb({ error: err.message });
} }
}); });
socket.on('roomCamera:unsubscribe', (payload = {}) => { socket.on('roomCamera:unsubscribe', (payload = {}) => {
const cameraId = payload.roomCameraId || payload.id; const list = Array.isArray(payload?.ids)
if (!cameraId) return; ? payload.ids.map(String)
removeSubscription(socket.id, String(cameraId)); : payload?.roomCameraId || payload?.id
? [String(payload.roomCameraId || payload.id)]
: [];
list.forEach((cameraId) => removeSubscription(socket.id, cameraId));
}); });
socket.on('disconnect', () => { socket.on('disconnect', () => {
webui/src/hooks/useRoomCameraSnapshots.js
+6 -104
View File
@@ -1,77 +1,23 @@
import { useEffect, useMemo, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import { useSocket } from '../context/SocketContext.jsx'; import { useSocket } from '../context/SocketContext.jsx';
const RETRY_DELAY_MS = 3000;
const RATE_LIMIT_RETRY_MS = 5000;
function normalizeCamera(entry) {
if (!entry) return null;
if (typeof entry === 'string') {
return { id: entry, key: entry };
}
if (entry.id) {
return { id: String(entry.id), key: entry.id };
}
return null;
}
function dedupe(entries = []) {
const seen = new Set();
const unique = [];
entries.forEach((entry) => {
if (!entry?.key || seen.has(entry.key)) return;
seen.add(entry.key);
unique.push(entry);
});
return unique.sort((a, b) => a.key.localeCompare(b.key));
}
export function useRoomCameraSnapshots(sourceList = []) { export function useRoomCameraSnapshots(sourceList = []) {
const socket = useSocket(); const socket = useSocket();
const [feeds, setFeeds] = useState({}); const [feeds, setFeeds] = useState({});
const objectUrls = useRef(new Map()); const objectUrls = useRef(new Map());
const normalizedEntries = useMemo(() => dedupe(sourceList.map(normalizeCamera).filter(Boolean)), [sourceList]); const entriesKey = useMemo(() => sourceList.map((e) => (typeof e === 'string' ? e : e.id)).join('|'), [sourceList]);
const entriesKey = useMemo(() => normalizedEntries.map((e) => e.key).join('|'), [normalizedEntries]);
const retryTimers = useRef(new Map());
const entriesRef = useRef([]);
const subscribeState = useRef(new Map()); // id -> 'idle' | 'pending' | 'subscribed'
useEffect(() => {
entriesRef.current = normalizedEntries;
}, [normalizedEntries]);
useEffect(() => { useEffect(() => {
objectUrls.current.forEach((url) => URL.revokeObjectURL(url)); objectUrls.current.forEach((url) => URL.revokeObjectURL(url));
objectUrls.current.clear(); objectUrls.current.clear();
setFeeds({}); setFeeds({});
retryTimers.current.forEach((timer) => clearTimeout(timer));
retryTimers.current.clear();
subscribeState.current.clear();
}, [entriesKey]); }, [entriesKey]);
useEffect(() => { useEffect(() => {
if (!entriesKey || !socket) { if (!sourceList.length || !socket) {
return undefined; return undefined;
} }
let cancelled = false; let cancelled = false;
const entries = entriesRef.current;
const clearRetry = (id) => {
const timer = retryTimers.current.get(id);
if (timer) {
clearTimeout(timer);
retryTimers.current.delete(id);
}
};
const scheduleRetry = (id) => {
clearRetry(id);
const timer = setTimeout(() => {
retryTimers.current.delete(id);
requestSubscribe(id);
}, RETRY_DELAY_MS);
retryTimers.current.set(id, timer);
};
const handleFrame = (meta = {}, buffer) => { const handleFrame = (meta = {}, buffer) => {
if (cancelled || !meta.id || !buffer) return; if (cancelled || !meta.id || !buffer) return;
@@ -109,64 +55,20 @@ export function useRoomCameraSnapshots(sourceList = []) {
})); }));
}; };
const requestSubscribe = (id) => {
const entry = entries.find((e) => e.id === id);
if (!entry) return;
// Avoid spamming subscribe if already pending/subscribed.
const state = subscribeState.current.get(id) || 'idle';
if (state === 'pending' || state === 'subscribed') {
return;
}
subscribeState.current.set(id, 'pending');
socket.emit('roomCamera:subscribe', { roomCameraId: entry.id }, (resp = {}) => {
if (resp.error) {
subscribeState.current.set(id, 'idle');
handleStatus({ id: entry.id, error: resp.error });
const delay = resp.error.toLowerCase().includes('rate') ? RATE_LIMIT_RETRY_MS : RETRY_DELAY_MS;
clearRetry(entry.id);
const timer = setTimeout(() => {
retryTimers.current.delete(entry.id);
requestSubscribe(entry.id);
}, delay);
retryTimers.current.set(entry.id, timer);
} else {
clearRetry(entry.id);
subscribeState.current.set(id, 'subscribed');
handleStatus({ id: entry.id, stale: true });
}
});
};
socket.on('roomCamera:frame', handleFrame); socket.on('roomCamera:frame', handleFrame);
socket.on('roomCamera:status', handleStatus); socket.on('roomCamera:status', handleStatus);
entries.forEach((entry) => requestSubscribe(entry.id)); socket.emit('roomCamera:subscribe', { ids: sourceList.map((e) => (typeof e === 'string' ? e : e.id)) });
return () => { return () => {
cancelled = true; cancelled = true;
entries.forEach((entry) => { socket.emit('roomCamera:unsubscribe', { ids: sourceList.map((e) => (typeof e === 'string' ? e : e.id)) });
socket.emit('roomCamera:unsubscribe', { roomCameraId: entry.id });
});
socket.off('roomCamera:frame', handleFrame); socket.off('roomCamera:frame', handleFrame);
socket.off('roomCamera:status', handleStatus); socket.off('roomCamera:status', handleStatus);
objectUrls.current.forEach((url) => URL.revokeObjectURL(url)); objectUrls.current.forEach((url) => URL.revokeObjectURL(url));
objectUrls.current.clear(); objectUrls.current.clear();
retryTimers.current.forEach((timer) => clearTimeout(timer));
retryTimers.current.clear();
subscribeState.current.clear();
}; };
}, [socket, entriesKey]); }, [socket, sourceList, entriesKey]);
const filtered = useMemo(() => { return feeds;
if (!entriesKey) return {};
const next = {};
normalizedEntries.forEach((entry) => {
if (feeds[entry.id]) {
next[entry.id] = feeds[entry.id];
}
});
return next;
}, [feeds, entriesKey, normalizedEntries]);
return filtered;
} }