legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-16 01:21: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-title" content="Multi Roomba Rover" />
<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">
</head>
<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 cameraState = new Map(); // id -> {frame, ts, stale, error, failures, fetching}
const pollers = new Map();
const events = new EventEmitter(); // frame, status
let pollTimer = null;
function markState(id, updates = {}) {
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() {
pollers.forEach((poller) => clearInterval(poller));
pollers.clear();
if (pollTimer) {
clearInterval(pollTimer);
pollTimer = null;
}
cameraState.clear();
}
function startAll() {
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) {
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 { getMode, MODES } = require('./modeManager');
const { isAdmin, isLockdownAdmin, getRole } = require('./roleService');
const { getRoomCamera } = require('./roomCameraService');
const { getRoomCamera, getRoomCameras } = require('./roomCameraService');
const { roomCameraStreamEvents, getRoomCameraState } = require('./roomCameraSnapshotService');
const SUBSCRIBE_LIMIT = 50;
@@ -104,39 +104,47 @@ roomCameraStreamEvents.on('status', ({ id, error }) => {
io.on('connection', (socket) => {
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 {
if (!allowSubscribe(socket.id)) {
cb({ error: 'Rate limited' });
return;
}
if (!cameraId) {
throw new Error('roomCameraId required');
}
const camera = getRoomCamera(cameraId);
if (!camera) {
throw new Error('Unknown room camera');
}
if (!canViewRoomCamera(socket)) {
throw new Error('Not authorized for room camera');
}
addSubscription(socket, camera.id);
const state = getRoomCameraState(camera.id);
if (state?.frame) {
sendFrame(socket, camera.id, { ts: state.ts, stale: !!state.stale }, state.frame);
}
sendStatus(socket, camera.id, { ts: state?.ts || null, stale: state?.stale ?? true, error: state?.error || null });
cb({ ok: true });
const validIds = uniqueIds.filter((id) => !!getRoomCamera(id));
validIds.forEach((cameraId) => addSubscription(socket, cameraId));
validIds.forEach((cameraId) => {
const state = getRoomCameraState(cameraId);
if (state?.frame) {
sendFrame(socket, cameraId, { ts: state.ts, stale: !!state.stale }, state.frame);
}
sendStatus(socket, cameraId, {
ts: state?.ts || null,
stale: state?.stale ?? true,
error: state?.error || null,
});
});
cb({ ok: true, subscribed: validIds });
} 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 });
}
});
socket.on('roomCamera:unsubscribe', (payload = {}) => {
const cameraId = payload.roomCameraId || payload.id;
if (!cameraId) return;
removeSubscription(socket.id, String(cameraId));
const list = Array.isArray(payload?.ids)
? payload.ids.map(String)
: payload?.roomCameraId || payload?.id
? [String(payload.roomCameraId || payload.id)]
: [];
list.forEach((cameraId) => removeSubscription(socket.id, cameraId));
});
socket.on('disconnect', () => {