mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-15 17:12:59 -04:00
first lol
This commit is contained in:
legop3
@@ -17,4 +17,6 @@ require('./src/services/assignmentService');
|
||||
require('./src/services/videoSessions');
|
||||
require('./src/services/videoAuthService');
|
||||
require('./src/services/videoSocketService');
|
||||
require('./src/services/logStreamService');
|
||||
require('./src/services/sessionService');
|
||||
require('./src/services/httpServer');
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,93 +1,14 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>Multi Roomba Rover</title>
|
||||
<style>
|
||||
body { font-family: sans-serif; margin: 16px; }
|
||||
#layout { display: flex; gap: 16px; }
|
||||
#roverList { width: 240px; }
|
||||
#sensorOutput { font-family: monospace; height: 320px; overflow: auto; border: 1px solid #999; padding: 8px; }
|
||||
button { margin: 4px; }
|
||||
.row { margin-bottom: 8px; }
|
||||
#alerts { margin-top: 12px; max-width: 600px; }
|
||||
.alert { background: #fff1d2; border: 1px solid #f0b651; padding: 6px 8px; margin-bottom: 6px; font-size: 0.9rem; }
|
||||
#authPanel { margin: 12px 0; display: flex; gap: 8px; align-items: center; }
|
||||
#authPanel input { padding: 4px; }
|
||||
#activeDriver { margin-bottom: 8px; font-weight: bold; }
|
||||
#videoPanel { margin-bottom: 12px; }
|
||||
#videoContainer { width: 100%; background: #000; min-height: 200px; display: flex; align-items: center; justify-content: center; }
|
||||
#videoContainer video { width: 100%; max-height: 320px; background: #000; }
|
||||
#videoStatus { margin-top: 6px; font-size: 0.9rem; color: #444; }
|
||||
</style>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>webui</title>
|
||||
<script type="module" crossorigin src="/assets/index-APFDmmUd.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-DoNH_msu.css">
|
||||
</head>
|
||||
<body>
|
||||
<h1>Multi Roomba Rover</h1>
|
||||
<div id="status">Connecting…</div>
|
||||
<div id="authPanel">
|
||||
<input id="username" placeholder="Username" />
|
||||
<input id="password" type="password" placeholder="Password" />
|
||||
<button id="loginBtn">Admin Login</button>
|
||||
<span id="roleStatus">Role: user</span>
|
||||
</div>
|
||||
<div id="layout">
|
||||
<div id="roverList">
|
||||
<label for="roverSelect">Rovers</label>
|
||||
<select id="roverSelect" size="10" style="width: 100%"></select>
|
||||
<div class="row" id="adminControls">
|
||||
<label><input type="checkbox" id="forceControl" /> Force control</label>
|
||||
<button id="lockToggle">Lock/Unlock</button>
|
||||
</div>
|
||||
<div class="row" id="modeControls" style="display:none">
|
||||
<label for="modeSelect">Server mode</label>
|
||||
<select id="modeSelect">
|
||||
<option value="open">Open</option>
|
||||
<option value="turns">Turns</option>
|
||||
<option value="admin">Admin</option>
|
||||
<option value="lockdown">Lockdown</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="row">
|
||||
<button data-oi="start">Start OI</button>
|
||||
<button data-oi="safe">Safe</button>
|
||||
<button data-oi="full">Full</button>
|
||||
<button data-oi="passive">Passive</button>
|
||||
<button data-oi="dock">Dock</button>
|
||||
</div>
|
||||
<div class="row">
|
||||
<button id="sensorToggle">Enable Sensor Stream</button>
|
||||
</div>
|
||||
<div class="row">
|
||||
<button id="motorsStop">Stop Motors</button>
|
||||
</div>
|
||||
</div>
|
||||
<div style="flex: 1">
|
||||
<h3>Sensor Frames</h3>
|
||||
<div id="currentRover">Active rover: --</div>
|
||||
<div id="activeDriver">Driver: --</div>
|
||||
<div id="videoPanel">
|
||||
<div id="videoContainer">
|
||||
<video id="driverVideo" muted playsinline></video>
|
||||
</div>
|
||||
<div id="videoStatus">No rover selected</div>
|
||||
<button id="videoReconnect">Reconnect Video</button>
|
||||
</div>
|
||||
<pre id="sensorOutput"></pre>
|
||||
<p>Use WASD keys to drive the selected rover. Shift increases speed.</p>
|
||||
<div id="alerts"></div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="/socket.io/socket.io.js"></script>
|
||||
<script src="loader.js"></script>
|
||||
<script src="src/globals/socket.js"></script>
|
||||
<script src="src/helpers/formatters.js"></script>
|
||||
<script src="src/services/state.js"></script>
|
||||
<script src="src/services/alertFeed.js"></script>
|
||||
<script src="src/services/authControls.js"></script>
|
||||
<script src="src/services/videoPlayer.js"></script>
|
||||
<script src="src/services/roverUI.js"></script>
|
||||
<script src="src/services/driveControls.js"></script>
|
||||
<script src="src/main.js"></script>
|
||||
<p><a href="/spectate/">Open spectator view</a></p>
|
||||
<div id="root"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
(function () {
|
||||
const modules = {};
|
||||
const cache = {};
|
||||
|
||||
window.registerModule = function (name, factory) {
|
||||
modules[name] = factory;
|
||||
};
|
||||
|
||||
window.requireModule = function (name) {
|
||||
if (cache[name]) {
|
||||
return cache[name];
|
||||
}
|
||||
const factory = modules[name];
|
||||
if (!factory) {
|
||||
throw new Error(`Module ${name} not found`);
|
||||
}
|
||||
const exports = {};
|
||||
cache[name] = exports;
|
||||
factory(requireModule, exports);
|
||||
return exports;
|
||||
};
|
||||
})();
|
||||
@@ -1,33 +0,0 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>Rover Spectator</title>
|
||||
<style>
|
||||
body { font-family: sans-serif; margin: 16px; }
|
||||
#status { margin-bottom: 12px; }
|
||||
#grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); gap: 12px; }
|
||||
.rover-card { border: 1px solid #ccc; padding: 12px; border-radius: 6px; background: #fdfdfd; }
|
||||
.rover-card h3 { margin: 0 0 8px 0; }
|
||||
.sensor { font-family: monospace; white-space: pre-wrap; word-break: break-word; }
|
||||
.meta { font-size: 0.9rem; color: #555; margin-bottom: 8px; }
|
||||
.video-wrap { background: #000; min-height: 160px; margin-bottom: 6px; display: flex; align-items: center; justify-content: center; }
|
||||
.video-wrap video { width: 100%; max-height: 200px; background: #000; }
|
||||
.video-status { font-size: 0.85rem; color: #444; margin-bottom: 4px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Rover Spectator</h1>
|
||||
<div id="status">Connecting…</div>
|
||||
<div id="grid"></div>
|
||||
|
||||
<script src="/socket.io/socket.io.js"></script>
|
||||
<script>
|
||||
window.__desiredRole = 'spectator';
|
||||
</script>
|
||||
<script src="../loader.js"></script>
|
||||
<script src="../src/globals/socket.js"></script>
|
||||
<script src="../src/services/videoPlayer.js"></script>
|
||||
<script src="spectator.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,131 +0,0 @@
|
||||
registerModule('spectator/main', (require, exports) => {
|
||||
const { socket } = require('globals/socket');
|
||||
const videoPlayer = require('services/videoPlayer');
|
||||
|
||||
const statusEl = document.getElementById('status');
|
||||
const grid = document.getElementById('grid');
|
||||
const cards = new Map();
|
||||
|
||||
socket.on('connect', () => {
|
||||
statusEl.textContent = 'Connected';
|
||||
});
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
statusEl.textContent = 'Disconnected';
|
||||
stopAllVideos();
|
||||
});
|
||||
|
||||
socket.on('lockdown', ({ message }) => {
|
||||
statusEl.textContent = message || 'Spectator mode disabled';
|
||||
stopAllVideos();
|
||||
});
|
||||
|
||||
socket.on('rovers', (list) => {
|
||||
list.forEach((rover) => {
|
||||
const card = ensureCard(rover.id);
|
||||
card.querySelector('.meta').textContent = `Locked: ${rover.locked ? 'yes' : 'no'} | Last seen: ${new Date(rover.lastSeen).toLocaleTimeString()}`;
|
||||
if (!card.dataset.videoActive) {
|
||||
connectVideo(rover.id);
|
||||
}
|
||||
});
|
||||
Array.from(cards.keys()).forEach((id) => {
|
||||
if (!list.find((r) => r.id === id)) {
|
||||
removeCard(id);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
socket.on('sensorFrame', ({ roverId, sensors }) => {
|
||||
const card = ensureCard(roverId);
|
||||
card.querySelector('.sensor').textContent = sensors ? JSON.stringify(sensors, null, 2) : 'No data';
|
||||
});
|
||||
|
||||
function ensureCard(roverId) {
|
||||
if (cards.has(roverId)) {
|
||||
return cards.get(roverId);
|
||||
}
|
||||
const card = document.createElement('div');
|
||||
card.className = 'rover-card';
|
||||
card.dataset.videoActive = '';
|
||||
card.innerHTML = `
|
||||
<h3>${roverId}</h3>
|
||||
<div class="meta"></div>
|
||||
<div class="video-wrap"></div>
|
||||
<div class="video-status">Video not connected</div>
|
||||
<button class="video-reconnect">Reconnect video</button>
|
||||
<pre class="sensor">Waiting for data...</pre>
|
||||
`;
|
||||
const reconnectBtn = card.querySelector('.video-reconnect');
|
||||
reconnectBtn.addEventListener('click', () => connectVideo(roverId, true));
|
||||
grid.appendChild(card);
|
||||
cards.set(roverId, card);
|
||||
connectVideo(roverId, true);
|
||||
return card;
|
||||
}
|
||||
|
||||
function connectVideo(roverId, force = false) {
|
||||
const card = ensureCard(roverId);
|
||||
const status = card.querySelector('.video-status');
|
||||
const wrap = card.querySelector('.video-wrap');
|
||||
const playerId = `spectator-${roverId}`;
|
||||
if (!force && card.dataset.videoActive === 'yes') {
|
||||
return;
|
||||
}
|
||||
status.textContent = 'Connecting video…';
|
||||
socket.emit('video:request', { roverId }, (resp = {}) => {
|
||||
if (resp.error) {
|
||||
status.textContent = `Video error: ${resp.error}`;
|
||||
videoPlayer.stopStream(playerId);
|
||||
card.dataset.videoActive = '';
|
||||
return;
|
||||
}
|
||||
videoPlayer
|
||||
.startStream(playerId, {
|
||||
url: resp.url,
|
||||
token: resp.token,
|
||||
mount: wrap,
|
||||
onStatus: (state, detail) => {
|
||||
if (state === 'playing') {
|
||||
status.textContent = 'Video live';
|
||||
card.dataset.videoActive = 'yes';
|
||||
} else if (state === 'connecting') {
|
||||
status.textContent = 'Connecting video…';
|
||||
} else if (state === 'error') {
|
||||
status.textContent = `Video error: ${detail}`;
|
||||
card.dataset.videoActive = '';
|
||||
} else if (state === 'stopped') {
|
||||
status.textContent = 'Video stopped';
|
||||
card.dataset.videoActive = '';
|
||||
}
|
||||
},
|
||||
})
|
||||
.catch((err) => {
|
||||
status.textContent = `Video error: ${err.message}`;
|
||||
card.dataset.videoActive = '';
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function removeCard(roverId) {
|
||||
const card = cards.get(roverId);
|
||||
if (card) {
|
||||
videoPlayer.stopStream(`spectator-${roverId}`);
|
||||
card.remove();
|
||||
cards.delete(roverId);
|
||||
}
|
||||
}
|
||||
|
||||
function stopAllVideos() {
|
||||
Array.from(cards.keys()).forEach((id) => {
|
||||
videoPlayer.stopStream(`spectator-${id}`);
|
||||
const card = cards.get(id);
|
||||
if (card) {
|
||||
const status = card.querySelector('.video-status');
|
||||
status.textContent = 'Video stopped';
|
||||
card.dataset.videoActive = '';
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
requireModule('spectator/main');
|
||||
@@ -1,8 +0,0 @@
|
||||
registerModule('globals/socket', (require, exports) => {
|
||||
const query = {};
|
||||
if (window.__desiredRole) {
|
||||
query.role = window.__desiredRole;
|
||||
}
|
||||
const socket = io(query.role ? { query } : undefined);
|
||||
exports.socket = socket;
|
||||
});
|
||||
@@ -1,11 +0,0 @@
|
||||
registerModule('helpers/formatters', (require, exports) => {
|
||||
function formatHex(base64) {
|
||||
if (!base64) return '';
|
||||
const buffer = Uint8Array.from(atob(base64), (c) => c.charCodeAt(0));
|
||||
return Array.from(buffer)
|
||||
.map((b) => b.toString(16).padStart(2, '0'))
|
||||
.join(' ');
|
||||
}
|
||||
|
||||
exports.formatHex = formatHex;
|
||||
});
|
||||
@@ -1,7 +0,0 @@
|
||||
requireModule('globals/socket');
|
||||
requireModule('helpers/formatters');
|
||||
requireModule('services/state');
|
||||
requireModule('services/alertFeed');
|
||||
requireModule('services/authControls');
|
||||
requireModule('services/roverUI');
|
||||
requireModule('services/driveControls');
|
||||
@@ -1,25 +0,0 @@
|
||||
registerModule('services/alertFeed', (require, exports) => {
|
||||
const { socket } = require('globals/socket');
|
||||
|
||||
const container = document.getElementById('alerts');
|
||||
if (!container) return;
|
||||
|
||||
function pushAlert({ color = '#2196f3', title, message, ts }) {
|
||||
const div = document.createElement('div');
|
||||
div.className = 'alert';
|
||||
div.style.borderColor = color;
|
||||
div.style.background = color + '22';
|
||||
div.innerHTML = `<strong>${title || 'Notice'}</strong> - ${message || ''}`;
|
||||
container.prepend(div);
|
||||
while (container.children.length > 5) {
|
||||
container.removeChild(container.lastChild);
|
||||
}
|
||||
setTimeout(() => {
|
||||
if (div.parentElement === container) {
|
||||
container.removeChild(div);
|
||||
}
|
||||
}, 15000);
|
||||
}
|
||||
|
||||
socket.on('alert', pushAlert);
|
||||
});
|
||||
@@ -1,35 +0,0 @@
|
||||
registerModule('services/authControls', (require, exports) => {
|
||||
const { socket } = require('globals/socket');
|
||||
const state = require('services/state');
|
||||
|
||||
const usernameInput = document.getElementById('username');
|
||||
const passwordInput = document.getElementById('password');
|
||||
const loginBtn = document.getElementById('loginBtn');
|
||||
const roleStatus = document.getElementById('roleStatus');
|
||||
|
||||
function updateRole(role) {
|
||||
if (roleStatus) {
|
||||
roleStatus.textContent = `Role: ${role}`;
|
||||
}
|
||||
state.setRole(role);
|
||||
}
|
||||
|
||||
loginBtn?.addEventListener('click', () => {
|
||||
const username = usernameInput.value.trim();
|
||||
const password = passwordInput.value;
|
||||
socket.emit('auth:login', { username, password }, (resp = {}) => {
|
||||
if (!resp.success) {
|
||||
alert(resp.error || 'Login failed');
|
||||
} else {
|
||||
updateRole(resp.role);
|
||||
}
|
||||
passwordInput.value = '';
|
||||
});
|
||||
});
|
||||
|
||||
socket.on('auth:role', ({ role }) => {
|
||||
updateRole(role);
|
||||
});
|
||||
// initialize from default role
|
||||
updateRole(state.getRole());
|
||||
});
|
||||
@@ -1,127 +0,0 @@
|
||||
registerModule('services/driveControls', (require, exports) => {
|
||||
const { socket } = require('globals/socket');
|
||||
const state = require('services/state');
|
||||
|
||||
const motorsStopBtn = document.getElementById('motorsStop');
|
||||
const sensorToggleBtn = document.getElementById('sensorToggle');
|
||||
const modeButtons = document.querySelectorAll('[data-oi]');
|
||||
|
||||
let sensorEnabled = false;
|
||||
let lastDrive = { left: 0, right: 0 };
|
||||
const keys = new Set();
|
||||
|
||||
window.addEventListener('keydown', (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
if (keys.has(key)) return;
|
||||
keys.add(key);
|
||||
maybeSendDriveUpdate();
|
||||
});
|
||||
|
||||
window.addEventListener('keyup', (event) => {
|
||||
const key = event.key.toLowerCase();
|
||||
if (!keys.has(key)) return;
|
||||
keys.delete(key);
|
||||
maybeSendDriveUpdate();
|
||||
});
|
||||
|
||||
function maybeSendDriveUpdate() {
|
||||
const roverId = state.getSelected();
|
||||
if (!roverId) return;
|
||||
const speeds = computeDrive();
|
||||
if (speeds.left === lastDrive.left && speeds.right === lastDrive.right) return;
|
||||
lastDrive = speeds;
|
||||
socket.emit('command', {
|
||||
roverId,
|
||||
type: 'drive',
|
||||
data: { driveDirect: speeds },
|
||||
});
|
||||
}
|
||||
|
||||
function computeDrive() {
|
||||
const forward = keys.has('w');
|
||||
const backward = keys.has('s');
|
||||
const left = keys.has('a');
|
||||
const right = keys.has('d');
|
||||
const fast = keys.has('shift');
|
||||
const base = fast ? 300 : 150;
|
||||
let leftSpeed = 0;
|
||||
let rightSpeed = 0;
|
||||
|
||||
if (forward && !backward) {
|
||||
leftSpeed += base;
|
||||
rightSpeed += base;
|
||||
} else if (backward && !forward) {
|
||||
leftSpeed -= base;
|
||||
rightSpeed -= base;
|
||||
}
|
||||
|
||||
if (left && !right) {
|
||||
leftSpeed -= base;
|
||||
rightSpeed += base;
|
||||
} else if (right && !left) {
|
||||
leftSpeed += base;
|
||||
rightSpeed -= base;
|
||||
}
|
||||
|
||||
if (!forward && !backward && (left || right)) {
|
||||
leftSpeed = left ? -base : base;
|
||||
rightSpeed = left ? base : -base;
|
||||
}
|
||||
|
||||
return {
|
||||
left: clamp(leftSpeed, -500, 500),
|
||||
right: clamp(rightSpeed, -500, 500),
|
||||
};
|
||||
}
|
||||
|
||||
function clamp(value, min, max) {
|
||||
return Math.max(min, Math.min(max, value));
|
||||
}
|
||||
|
||||
motorsStopBtn?.addEventListener('click', () => {
|
||||
const roverId = state.getSelected();
|
||||
if (!roverId) return;
|
||||
socket.emit('command', {
|
||||
roverId,
|
||||
type: 'motors',
|
||||
data: { motorPwm: { main: 0, side: 0, vacuum: 0 } },
|
||||
});
|
||||
});
|
||||
|
||||
sensorToggleBtn?.addEventListener('click', () => {
|
||||
sensorEnabled = !sensorEnabled;
|
||||
sensorToggleBtn.textContent = sensorEnabled ? 'Disable Sensor Stream' : 'Enable Sensor Stream';
|
||||
const roverId = state.getSelected();
|
||||
socket.emit('command', {
|
||||
roverId,
|
||||
type: 'sensorStream',
|
||||
data: { sensorStream: { enable: sensorEnabled } },
|
||||
});
|
||||
});
|
||||
|
||||
const OI_COMMANDS = {
|
||||
start: [128],
|
||||
safe: [131],
|
||||
full: [132],
|
||||
passive: [128],
|
||||
dock: [143],
|
||||
};
|
||||
|
||||
modeButtons.forEach((btn) => {
|
||||
btn.addEventListener('click', () => {
|
||||
const cmd = btn.dataset.oi;
|
||||
const bytes = OI_COMMANDS[cmd];
|
||||
if (!bytes) return;
|
||||
const roverId = state.getSelected();
|
||||
socket.emit('command', {
|
||||
roverId,
|
||||
type: 'raw',
|
||||
data: { raw: bytesToBase64(bytes) },
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
function bytesToBase64(bytes) {
|
||||
return btoa(String.fromCharCode(...bytes));
|
||||
}
|
||||
});
|
||||
@@ -1,185 +0,0 @@
|
||||
registerModule('services/roverUI', (require, exports) => {
|
||||
const { socket } = require('globals/socket');
|
||||
const { formatHex } = require('helpers/formatters');
|
||||
const videoPlayer = require('services/videoPlayer');
|
||||
const state = require('services/state');
|
||||
|
||||
const statusEl = document.getElementById('status');
|
||||
const roverSelect = document.getElementById('roverSelect');
|
||||
const sensorOutput = document.getElementById('sensorOutput');
|
||||
const lockBtn = document.getElementById('lockToggle');
|
||||
const forceCheckbox = document.getElementById('forceControl');
|
||||
const adminControls = document.getElementById('adminControls');
|
||||
const modeControls = document.getElementById('modeControls');
|
||||
const modeSelect = document.getElementById('modeSelect');
|
||||
const activeDriverEl = document.getElementById('activeDriver');
|
||||
const currentRoverEl = document.getElementById('currentRover');
|
||||
const videoContainer = document.getElementById('videoContainer');
|
||||
const driverVideo = document.getElementById('driverVideo');
|
||||
const videoStatus = document.getElementById('videoStatus');
|
||||
const videoReconnect = document.getElementById('videoReconnect');
|
||||
|
||||
let roster = [];
|
||||
let lastSelection = null;
|
||||
let currentVideoRover = null;
|
||||
|
||||
state.onRoleChange((role) => {
|
||||
const isAdmin = role === 'admin' || role === 'lockdown';
|
||||
if (lockBtn) lockBtn.disabled = !isAdmin;
|
||||
if (roverSelect) roverSelect.disabled = !isAdmin;
|
||||
if (adminControls) {
|
||||
adminControls.style.display = isAdmin ? 'flex' : 'none';
|
||||
}
|
||||
if (modeControls) {
|
||||
modeControls.style.display = isAdmin ? 'block' : 'none';
|
||||
if (modeSelect) modeSelect.disabled = !isAdmin;
|
||||
}
|
||||
});
|
||||
|
||||
socket.on('rovers', (list) => {
|
||||
roster = list;
|
||||
roverSelect.innerHTML = '';
|
||||
list.forEach((rover) => {
|
||||
const option = document.createElement('option');
|
||||
option.value = rover.id;
|
||||
option.textContent = `${rover.name}${rover.locked ? ' (locked)' : ''}`;
|
||||
roverSelect.appendChild(option);
|
||||
});
|
||||
const selected = state.getSelected();
|
||||
if ((!selected || !list.find((r) => r.id === selected)) && list.length) {
|
||||
state.setSelected(list[0].id);
|
||||
} else if (!list.length) {
|
||||
state.setSelected(null);
|
||||
}
|
||||
renderSelection(true);
|
||||
});
|
||||
|
||||
roverSelect.addEventListener('change', () => {
|
||||
const roverId = roverSelect.value;
|
||||
const role = state.getRole();
|
||||
state.setSelected(roverId);
|
||||
renderSelection(true);
|
||||
if (role === 'admin' || role === 'lockdown') {
|
||||
socket.emit('requestControl', { roverId, force: !!forceCheckbox?.checked });
|
||||
}
|
||||
});
|
||||
|
||||
socket.on('controlGranted', ({ roverId }) => {
|
||||
state.setSelected(roverId);
|
||||
renderSelection(true);
|
||||
statusEl.textContent = `Driving ${roverId}`;
|
||||
maybeConnectVideo(true);
|
||||
});
|
||||
|
||||
socket.on('sensorFrame', ({ roverId, frame, sensors }) => {
|
||||
if (roverId !== state.getSelected()) return;
|
||||
const lines = [];
|
||||
if (sensors) {
|
||||
Object.entries(sensors).forEach(([key, value]) => {
|
||||
lines.push(`${key}: ${typeof value === 'object' ? JSON.stringify(value) : value}`);
|
||||
});
|
||||
}
|
||||
lines.push('', 'raw:', formatHex(frame?.data));
|
||||
sensorOutput.textContent = lines.join('\n');
|
||||
});
|
||||
|
||||
socket.on('activeDriver', ({ roverId, socketId }) => {
|
||||
if (roverId !== state.getSelected()) return;
|
||||
if (activeDriverEl) {
|
||||
activeDriverEl.textContent = `Active driver: ${socketId || 'none'}`;
|
||||
}
|
||||
});
|
||||
|
||||
lockBtn?.addEventListener('click', () => {
|
||||
const roverId = state.getSelected();
|
||||
const rover = roster.find((r) => r.id === roverId);
|
||||
if (!rover) return;
|
||||
socket.emit('lockRover', { roverId, locked: !rover.locked });
|
||||
});
|
||||
|
||||
modeSelect?.addEventListener('change', () => {
|
||||
socket.emit('setMode', { mode: modeSelect.value });
|
||||
});
|
||||
|
||||
socket.on('mode', ({ mode }) => {
|
||||
if (modeSelect) {
|
||||
modeSelect.value = mode;
|
||||
}
|
||||
});
|
||||
|
||||
videoReconnect?.addEventListener('click', () => maybeConnectVideo(true));
|
||||
|
||||
socket.on('connect', () => {
|
||||
statusEl.textContent = 'Connected';
|
||||
});
|
||||
socket.on('disconnect', () => {
|
||||
statusEl.textContent = 'Disconnected';
|
||||
});
|
||||
|
||||
function renderSelection(clearOutput) {
|
||||
const roverId = state.getSelected();
|
||||
if (roverSelect && roverId) {
|
||||
roverSelect.value = roverId;
|
||||
} else if (roverSelect && !roverId) {
|
||||
roverSelect.value = '';
|
||||
}
|
||||
if (currentRoverEl) {
|
||||
currentRoverEl.textContent = `Active rover: ${roverId || '--'}`;
|
||||
}
|
||||
if (sensorOutput && (clearOutput || roverId !== lastSelection)) {
|
||||
sensorOutput.textContent = roverId ? 'Waiting for sensor data...' : '';
|
||||
}
|
||||
lastSelection = roverId;
|
||||
maybeConnectVideo(clearOutput);
|
||||
}
|
||||
|
||||
function maybeConnectVideo(force = false) {
|
||||
const roverId = state.getSelected();
|
||||
if (!roverId) {
|
||||
currentVideoRover = null;
|
||||
videoPlayer.stopStream('driver');
|
||||
setVideoStatus('No rover selected');
|
||||
return;
|
||||
}
|
||||
if (!force && roverId === currentVideoRover) {
|
||||
return;
|
||||
}
|
||||
currentVideoRover = roverId;
|
||||
setVideoStatus('Connecting video…');
|
||||
socket.emit('video:request', { roverId }, (resp = {}) => {
|
||||
if (resp.error) {
|
||||
setVideoStatus(`Video error: ${resp.error}`);
|
||||
videoPlayer.stopStream('driver');
|
||||
return;
|
||||
}
|
||||
const { url, token } = resp;
|
||||
videoPlayer
|
||||
.startStream('driver', {
|
||||
url,
|
||||
token,
|
||||
mount: videoContainer,
|
||||
videoEl: driverVideo,
|
||||
onStatus: (state, detail) => {
|
||||
if (state === 'playing') {
|
||||
setVideoStatus('Video live');
|
||||
} else if (state === 'connecting') {
|
||||
setVideoStatus('Connecting video…');
|
||||
} else if (state === 'error') {
|
||||
setVideoStatus(`Video error: ${detail}`);
|
||||
} else if (state === 'stopped') {
|
||||
setVideoStatus('Video stopped');
|
||||
}
|
||||
},
|
||||
})
|
||||
.catch((err) => {
|
||||
setVideoStatus(`Video error: ${err.message}`);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function setVideoStatus(message) {
|
||||
if (videoStatus) {
|
||||
videoStatus.textContent = message;
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1,34 +0,0 @@
|
||||
registerModule('services/state', (require, exports) => {
|
||||
let selectedRover = null;
|
||||
let role = 'user';
|
||||
const roleListeners = new Set();
|
||||
|
||||
function setSelected(roverId) {
|
||||
selectedRover = roverId;
|
||||
}
|
||||
|
||||
function getSelected() {
|
||||
return selectedRover;
|
||||
}
|
||||
|
||||
function setRole(nextRole) {
|
||||
role = nextRole;
|
||||
roleListeners.forEach((cb) => cb(role));
|
||||
}
|
||||
|
||||
function getRole() {
|
||||
return role;
|
||||
}
|
||||
|
||||
function onRoleChange(cb) {
|
||||
roleListeners.add(cb);
|
||||
cb(role);
|
||||
return () => roleListeners.delete(cb);
|
||||
}
|
||||
|
||||
exports.setSelected = setSelected;
|
||||
exports.getSelected = getSelected;
|
||||
exports.setRole = setRole;
|
||||
exports.getRole = getRole;
|
||||
exports.onRoleChange = onRoleChange;
|
||||
});
|
||||
@@ -1,152 +0,0 @@
|
||||
registerModule('services/videoPlayer', (require, exports) => {
|
||||
const players = new Map();
|
||||
|
||||
class Player {
|
||||
constructor(id, options = {}) {
|
||||
this.id = id;
|
||||
this.options = options;
|
||||
this.onStatus = options.onStatus || (() => {});
|
||||
this.mount = options.mount || null;
|
||||
this.externalVideo = options.videoEl || null;
|
||||
this.video = this.externalVideo || this.createVideoElement();
|
||||
this.video.muted = true;
|
||||
this.status('idle');
|
||||
}
|
||||
|
||||
createVideoElement() {
|
||||
const el = document.createElement('video');
|
||||
el.autoplay = true;
|
||||
el.playsInline = true;
|
||||
el.controls = false;
|
||||
el.muted = true;
|
||||
el.style.width = '100%';
|
||||
el.style.maxHeight = '360px';
|
||||
if (this.mount) {
|
||||
this.mount.innerHTML = '';
|
||||
this.mount.appendChild(el);
|
||||
}
|
||||
return el;
|
||||
}
|
||||
|
||||
attachAutoPlayLoop() {
|
||||
this.autoPlayTimer = window.setInterval(() => {
|
||||
if (!this.video) return;
|
||||
if (!this.video.paused && !this.video.muted) {
|
||||
clearInterval(this.autoPlayTimer);
|
||||
this.autoPlayTimer = null;
|
||||
return;
|
||||
}
|
||||
const attempt = () => this.video.play().catch(() => {});
|
||||
if (this.video.paused) {
|
||||
attempt();
|
||||
}
|
||||
if (this.video.muted) {
|
||||
this.video.muted = false;
|
||||
attempt();
|
||||
}
|
||||
}, 2500);
|
||||
}
|
||||
|
||||
status(state, detail) {
|
||||
this.onStatus(state, detail);
|
||||
}
|
||||
|
||||
async start(url, token) {
|
||||
this.stopPeer();
|
||||
this.status('connecting');
|
||||
this.pc = new RTCPeerConnection();
|
||||
this.stream = new MediaStream();
|
||||
this.video.srcObject = this.stream;
|
||||
this.pc.addTransceiver('video', { direction: 'recvonly' });
|
||||
this.pc.addTransceiver('audio', { direction: 'recvonly' });
|
||||
this.pc.ontrack = (event) => {
|
||||
const [remoteStream] = event.streams;
|
||||
if (remoteStream) {
|
||||
this.video.srcObject = remoteStream;
|
||||
} else {
|
||||
this.stream.addTrack(event.track);
|
||||
}
|
||||
this.video.play().catch(() => {});
|
||||
};
|
||||
this.attachAutoPlayLoop();
|
||||
|
||||
if (!token) {
|
||||
throw new Error('Missing video session token');
|
||||
}
|
||||
const offer = await this.pc.createOffer();
|
||||
await this.pc.setLocalDescription(offer);
|
||||
const response = await fetch(url, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/sdp',
|
||||
Authorization: `Basic ${btoa(`${token}:${token}`)}`,
|
||||
},
|
||||
body: offer.sdp,
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error(`WHEP HTTP ${response.status}`);
|
||||
}
|
||||
const answer = await response.text();
|
||||
await this.pc.setRemoteDescription({ type: 'answer', sdp: answer });
|
||||
this.status('playing');
|
||||
}
|
||||
|
||||
stopPeer() {
|
||||
if (this.autoPlayTimer) {
|
||||
clearInterval(this.autoPlayTimer);
|
||||
this.autoPlayTimer = null;
|
||||
}
|
||||
if (this.pc) {
|
||||
this.pc.getSenders().forEach((sender) => sender.track && sender.track.stop());
|
||||
this.pc.getReceivers().forEach((receiver) => receiver.track && receiver.track.stop());
|
||||
this.pc.close();
|
||||
this.pc = null;
|
||||
}
|
||||
if (this.video) {
|
||||
const tracks = this.video.srcObject?.getTracks() || [];
|
||||
tracks.forEach((t) => t.stop());
|
||||
this.video.pause();
|
||||
this.video.srcObject = null;
|
||||
}
|
||||
}
|
||||
|
||||
stop() {
|
||||
this.stopPeer();
|
||||
if (!this.externalVideo && this.video && this.video.parentElement) {
|
||||
this.video.parentElement.removeChild(this.video);
|
||||
}
|
||||
this.status('stopped');
|
||||
}
|
||||
}
|
||||
|
||||
async function startStream(id, { url, token, mount, videoEl, onStatus } = {}) {
|
||||
stopStream(id);
|
||||
const player = new Player(id, { mount, videoEl, onStatus });
|
||||
players.set(id, player);
|
||||
try {
|
||||
await player.start(url, token);
|
||||
return player.video;
|
||||
} catch (err) {
|
||||
player.status('error', err.message);
|
||||
player.stop();
|
||||
players.delete(id);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
function stopStream(id) {
|
||||
const existing = players.get(id);
|
||||
if (existing) {
|
||||
existing.stop();
|
||||
players.delete(id);
|
||||
}
|
||||
}
|
||||
|
||||
function stopAll() {
|
||||
Array.from(players.keys()).forEach(stopStream);
|
||||
}
|
||||
|
||||
exports.startStream = startStream;
|
||||
exports.stopStream = stopStream;
|
||||
exports.stopAll = stopAll;
|
||||
});
|
||||
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -1,8 +1,37 @@
|
||||
const sinks = new Set();
|
||||
|
||||
function notifySinks(level, label, args) {
|
||||
if (!sinks.size) return;
|
||||
const entry = {
|
||||
level,
|
||||
label: label || null,
|
||||
args,
|
||||
message: args.map((value) => {
|
||||
if (typeof value === 'string') return value;
|
||||
try {
|
||||
return JSON.stringify(value);
|
||||
} catch (err) {
|
||||
return String(value);
|
||||
}
|
||||
}).join(' '),
|
||||
timestamp: new Date().toISOString(),
|
||||
};
|
||||
sinks.forEach((sink) => {
|
||||
try {
|
||||
sink(entry);
|
||||
} catch (err) {
|
||||
// avoid recursive logging
|
||||
console.error(entry.timestamp, '[ERROR]', '[logger]', 'Log sink failed', err);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function stamp(level, label, args) {
|
||||
const fields = [new Date().toISOString(), `[${level}]`];
|
||||
if (label) {
|
||||
fields.push(`[${label}]`);
|
||||
}
|
||||
notifySinks(level, label, args);
|
||||
return [...fields, ...args];
|
||||
}
|
||||
|
||||
@@ -14,7 +43,14 @@ function baseLogger(label) {
|
||||
};
|
||||
}
|
||||
|
||||
function registerSink(fn) {
|
||||
if (typeof fn !== 'function') return () => {};
|
||||
sinks.add(fn);
|
||||
return () => sinks.delete(fn);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
...baseLogger(),
|
||||
child: (label) => baseLogger(label),
|
||||
registerSink,
|
||||
};
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
const EventEmitter = require('events');
|
||||
const io = require('../globals/io');
|
||||
const logger = require('../globals/logger').child('assignment');
|
||||
const { MODES, getMode, modeEvents } = require('./modeManager');
|
||||
@@ -7,6 +8,7 @@ const roverManager = require('./roverManager');
|
||||
const socketRefs = new Map(); // socketId -> socket
|
||||
const assignments = new Map(); // socketId -> roverId
|
||||
const waiting = new Set(); // socketIds waiting for placement
|
||||
const assignmentEvents = new EventEmitter();
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
socketRefs.set(socket.id, socket);
|
||||
@@ -64,6 +66,7 @@ function assignSocket(socket) {
|
||||
if (!target) {
|
||||
waiting.add(socket.id);
|
||||
logger.info('No rover available, user waiting', socket.id);
|
||||
assignmentEvents.emit('update', socket.id);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
@@ -71,9 +74,11 @@ function assignSocket(socket) {
|
||||
assignments.set(socket.id, target.id);
|
||||
waiting.delete(socket.id);
|
||||
logger.info('Assigned user to rover', socket.id, target.id);
|
||||
assignmentEvents.emit('update', socket.id);
|
||||
} catch (err) {
|
||||
logger.warn('Failed to assign user', err.message);
|
||||
waiting.add(socket.id);
|
||||
assignmentEvents.emit('update', socket.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,6 +89,8 @@ function unassignSocket(socket) {
|
||||
if (roverId) {
|
||||
roverManager.releaseControl(roverId, socket);
|
||||
assignments.delete(socket.id);
|
||||
logger.info('Unassigned socket from rover', socket.id, roverId);
|
||||
assignmentEvents.emit('update', socket.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,6 +105,7 @@ function reassignFromRover(roverId) {
|
||||
roverManager.releaseControl(rid, socket);
|
||||
assignments.delete(socketId);
|
||||
assignSocket(socket);
|
||||
assignmentEvents.emit('update', socketId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,6 +117,7 @@ function reassignWaiting() {
|
||||
} else {
|
||||
waiting.delete(socketId);
|
||||
}
|
||||
assignmentEvents.emit('update', socketId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,6 +125,8 @@ function releaseAssignment(socket, roverId) {
|
||||
roverManager.releaseControl(roverId, socket);
|
||||
assignments.delete(socket.id);
|
||||
waiting.add(socket.id);
|
||||
logger.info('Released assignment back to queue', socket.id, roverId);
|
||||
assignmentEvents.emit('update', socket.id);
|
||||
}
|
||||
|
||||
function pickRover() {
|
||||
@@ -133,3 +144,18 @@ function pickRover() {
|
||||
candidates.sort((a, b) => a.drivers.size - b.drivers.size);
|
||||
return candidates[0];
|
||||
}
|
||||
|
||||
function describeAssignment(socketId) {
|
||||
const roverId = assignments.get(socketId) || null;
|
||||
const waitingIndex = waiting.has(socketId) ? Array.from(waiting).indexOf(socketId) : -1;
|
||||
return {
|
||||
roverId,
|
||||
status: roverId ? 'assigned' : waiting.has(socketId) ? 'waiting' : null,
|
||||
queuePosition: waitingIndex >= 0 ? waitingIndex + 1 : null,
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
assignmentEvents,
|
||||
describeAssignment,
|
||||
};
|
||||
|
||||
@@ -36,6 +36,7 @@ io.on('connection', (socket) => {
|
||||
const requestedRole = socket.handshake?.query?.role;
|
||||
const initialRole = requestedRole === 'spectator' ? 'spectator' : 'user';
|
||||
setRole(socket, initialRole);
|
||||
logger.info('Socket connected with role', socket.id, initialRole);
|
||||
socket.emit('auth:role', { role: initialRole });
|
||||
socket.on('auth:login', async ({ username, password }, cb = () => {}) => {
|
||||
try {
|
||||
@@ -45,18 +46,27 @@ io.on('connection', (socket) => {
|
||||
setRole(socket, role);
|
||||
socket.emit('auth:role', { role });
|
||||
clearLockdownTimer(socket);
|
||||
logger.info('Login success', socket.id, role);
|
||||
cb({ success: true, role: socket.data.role });
|
||||
} catch (err) {
|
||||
logger.warn('Login failed', socket.id, err.message);
|
||||
cb({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
socket.on('role:set', ({ role }) => {
|
||||
function handleRoleChange({ role } = {}, cb = () => {}) {
|
||||
if (role === 'spectator' || role === 'user') {
|
||||
setRole(socket, role);
|
||||
socket.emit('auth:role', { role });
|
||||
logger.info('Role changed via client request', socket.id, role);
|
||||
cb({ success: true, role });
|
||||
} else {
|
||||
cb({ error: 'Invalid role' });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
socket.on('role:set', handleRoleChange);
|
||||
socket.on('session:setRole', handleRoleChange);
|
||||
});
|
||||
|
||||
module.exports = {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
const io = require('../globals/io');
|
||||
const roverManager = require('./roverManager');
|
||||
const logger = require('../globals/logger').child('commandService');
|
||||
|
||||
const pendingCommands = new Map(); // id -> { roverId }
|
||||
|
||||
@@ -13,6 +14,7 @@ function issueCommand(roverId, payload) {
|
||||
const message = { ...payload, id };
|
||||
record.ws.send(JSON.stringify(message));
|
||||
pendingCommands.set(id, { roverId, ts: Date.now(), type: payload.type });
|
||||
logger.info('Issued command', roverId, payload.type, id);
|
||||
return id;
|
||||
}
|
||||
|
||||
@@ -20,6 +22,7 @@ function handleAck(msg) {
|
||||
const pending = pendingCommands.get(msg.id);
|
||||
if (!pending) return;
|
||||
pendingCommands.delete(msg.id);
|
||||
logger.info('Command acknowledged', pending.roverId, pending.type, msg.status);
|
||||
io.emit('commandAck', {
|
||||
roverId: pending.roverId,
|
||||
id: msg.id,
|
||||
@@ -34,7 +37,7 @@ module.exports = {
|
||||
};
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
socket.on('command', ({ roverId, type, data } = {}, cb = () => {}) => {
|
||||
function handleCommand({ roverId, type, data } = {}, cb = () => {}) {
|
||||
try {
|
||||
if (!roverId) {
|
||||
throw new Error('roverId required');
|
||||
@@ -44,9 +47,14 @@ io.on('connection', (socket) => {
|
||||
}
|
||||
const payload = data ? { ...data } : {};
|
||||
const id = issueCommand(roverId, { type, ...payload });
|
||||
logger.info('Queued command', socket.id, roverId, type);
|
||||
cb({ id });
|
||||
} catch (err) {
|
||||
logger.warn('Command rejected', socket.id, err.message);
|
||||
cb({ error: err.message });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
socket.on('command', handleCommand);
|
||||
socket.on('command:issue', handleCommand);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
const { v4: uuidv4 } = require('uuid');
|
||||
const io = require('../globals/io');
|
||||
const loggerRoot = require('../globals/logger');
|
||||
const logger = loggerRoot.child('logStream');
|
||||
|
||||
const MAX_HISTORY = 200;
|
||||
const history = [];
|
||||
|
||||
function pushEntry(entry) {
|
||||
history.push(entry);
|
||||
if (history.length > MAX_HISTORY) {
|
||||
history.shift();
|
||||
}
|
||||
}
|
||||
|
||||
function broadcast(entry) {
|
||||
io.emit('log:entry', entry);
|
||||
}
|
||||
|
||||
function hydrateSocket(socket) {
|
||||
if (!socket) return;
|
||||
socket.emit('log:init', history);
|
||||
}
|
||||
|
||||
loggerRoot.registerSink(({ level, label, message, timestamp }) => {
|
||||
const entry = {
|
||||
id: uuidv4(),
|
||||
level,
|
||||
label,
|
||||
message,
|
||||
timestamp,
|
||||
};
|
||||
pushEntry(entry);
|
||||
broadcast(entry);
|
||||
});
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
logger.info('Hydrating log history for', socket.id);
|
||||
hydrateSocket(socket);
|
||||
});
|
||||
@@ -212,43 +212,72 @@ io.on('connection', (socket) => {
|
||||
enableSpectator(socket);
|
||||
}
|
||||
|
||||
socket.on('requestControl', ({ roverId, force } = {}) => {
|
||||
function handleRequestControl({ roverId, force } = {}, cb = () => {}) {
|
||||
try {
|
||||
const targetId = roverId || Array.from(rovers.keys())[0];
|
||||
if (!targetId) {
|
||||
throw new Error('No rovers available');
|
||||
}
|
||||
logger.info('Request control', socket.id, targetId, { force });
|
||||
requestControl(targetId, socket, { force: Boolean(force) });
|
||||
socket.emit('controlGranted', { roverId: targetId });
|
||||
cb({ success: true, roverId: targetId });
|
||||
} catch (err) {
|
||||
logger.warn('Request control failed', socket.id, err.message);
|
||||
sendAlert({ color: COLORS.warn, title: 'Control denied', message: err.message });
|
||||
cb({ error: err.message });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
socket.on('releaseControl', ({ roverId }) => {
|
||||
if (!roverId) return;
|
||||
releaseControl(roverId, socket);
|
||||
});
|
||||
|
||||
socket.on('lockRover', ({ roverId, locked }) => {
|
||||
if (!isAdmin(socket)) return;
|
||||
try {
|
||||
lockRover(roverId, locked);
|
||||
} catch (err) {
|
||||
sendAlert({ color: COLORS.error, title: 'Lock failed', message: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
socket.on('subscribeAll', () => {
|
||||
if (socket.data?.role !== 'spectator') {
|
||||
function handleReleaseControl({ roverId } = {}, cb = () => {}) {
|
||||
if (!roverId) {
|
||||
cb({ error: 'roverId required' });
|
||||
return;
|
||||
}
|
||||
logger.info('Release control', socket.id, roverId);
|
||||
releaseControl(roverId, socket);
|
||||
cb({ success: true, roverId });
|
||||
}
|
||||
|
||||
function handleLockToggle({ roverId, locked } = {}, cb = () => {}) {
|
||||
if (!isAdmin(socket)) {
|
||||
cb({ error: 'Not authorized' });
|
||||
return;
|
||||
}
|
||||
try {
|
||||
lockRover(roverId, locked);
|
||||
logger.info('Lock state changed', roverId, locked);
|
||||
cb({ success: true });
|
||||
} catch (err) {
|
||||
logger.warn('Lock change failed', roverId, err.message);
|
||||
sendAlert({ color: COLORS.error, title: 'Lock failed', message: err.message });
|
||||
cb({ error: err.message });
|
||||
}
|
||||
}
|
||||
|
||||
function handleSubscribeAll(_, cb = () => {}) {
|
||||
if (socket.data?.role !== 'spectator') {
|
||||
cb({ error: 'Spectator role required' });
|
||||
return;
|
||||
}
|
||||
logger.info('Spectator subscribing to all rovers', socket.id);
|
||||
for (const record of rovers.values()) {
|
||||
socket.join(record.room);
|
||||
}
|
||||
});
|
||||
cb({ success: true });
|
||||
}
|
||||
|
||||
socket.on('requestControl', handleRequestControl);
|
||||
socket.on('session:requestControl', handleRequestControl);
|
||||
socket.on('releaseControl', handleReleaseControl);
|
||||
socket.on('session:releaseControl', handleReleaseControl);
|
||||
socket.on('lockRover', handleLockToggle);
|
||||
socket.on('session:lockRover', handleLockToggle);
|
||||
socket.on('subscribeAll', handleSubscribeAll);
|
||||
socket.on('session:subscribeAll', handleSubscribeAll);
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
logger.info('Socket disconnected', socket.id);
|
||||
removeSocket(socket);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
const io = require('../globals/io');
|
||||
const logger = require('../globals/logger').child('sessionService');
|
||||
const { getRole, roleEvents } = require('./roleService');
|
||||
const { getMode, modeEvents } = require('./modeManager');
|
||||
const roverManager = require('./roverManager');
|
||||
const { managerEvents } = roverManager;
|
||||
const assignmentService = require('./assignmentService');
|
||||
|
||||
function buildSession(socket) {
|
||||
return {
|
||||
role: getRole(socket),
|
||||
mode: getMode(),
|
||||
roster: roverManager.getRoster(),
|
||||
assignment: assignmentService.describeAssignment(socket?.id || ''),
|
||||
};
|
||||
}
|
||||
|
||||
function syncSocket(socket) {
|
||||
if (!socket) return;
|
||||
const payload = buildSession(socket);
|
||||
logger.info('Syncing session', socket.id, payload.role, payload.assignment);
|
||||
socket.emit('session:sync', payload);
|
||||
}
|
||||
|
||||
function syncAll() {
|
||||
logger.info('Broadcasting session sync to all sockets');
|
||||
io.sockets.sockets.forEach((socket) => syncSocket(socket));
|
||||
}
|
||||
|
||||
io.on('connection', (socket) => {
|
||||
logger.info('New socket connected', socket.id);
|
||||
syncSocket(socket);
|
||||
});
|
||||
|
||||
roleEvents.on('change', ({ socket }) => {
|
||||
if (!socket) return;
|
||||
logger.info('Role changed; syncing session', socket.id);
|
||||
syncSocket(socket);
|
||||
});
|
||||
|
||||
assignmentService.assignmentEvents.on('update', (socketId) => {
|
||||
const socket = io.sockets.sockets.get(socketId);
|
||||
if (socket) {
|
||||
logger.info('Assignment update; syncing session', socketId);
|
||||
syncSocket(socket);
|
||||
}
|
||||
});
|
||||
|
||||
modeEvents.on('change', () => {
|
||||
logger.info('Mode change detected; syncing all clients');
|
||||
syncAll();
|
||||
});
|
||||
|
||||
managerEvents.on('rover', () => {
|
||||
logger.info('Rover roster change; syncing all clients');
|
||||
syncAll();
|
||||
});
|
||||
|
||||
managerEvents.on('lock', ({ roverId, locked }) => {
|
||||
logger.info('Rover lock change', roverId, locked);
|
||||
syncAll();
|
||||
});
|
||||
|
||||
module.exports = {
|
||||
buildSession,
|
||||
syncSocket,
|
||||
syncAll,
|
||||
};
|
||||
@@ -0,0 +1,24 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
@@ -0,0 +1,16 @@
|
||||
# React + Vite
|
||||
|
||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||
|
||||
Currently, two official plugins are available:
|
||||
|
||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
|
||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||
|
||||
## React Compiler
|
||||
|
||||
The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
|
||||
|
||||
## Expanding the ESLint configuration
|
||||
|
||||
If you are developing a production application, we recommend using TypeScript with type-aware lint rules enabled. Check out the [TS template](https://github.com/vitejs/vite/tree/main/packages/create-vite/template-react-ts) for information on how to integrate TypeScript and [`typescript-eslint`](https://typescript-eslint.io) in your project.
|
||||
@@ -0,0 +1,29 @@
|
||||
import js from '@eslint/js'
|
||||
import globals from 'globals'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
import { defineConfig, globalIgnores } from 'eslint/config'
|
||||
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{js,jsx}'],
|
||||
extends: [
|
||||
js.configs.recommended,
|
||||
reactHooks.configs.flat.recommended,
|
||||
reactRefresh.configs.vite,
|
||||
],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2020,
|
||||
globals: globals.browser,
|
||||
parserOptions: {
|
||||
ecmaVersion: 'latest',
|
||||
ecmaFeatures: { jsx: true },
|
||||
sourceType: 'module',
|
||||
},
|
||||
},
|
||||
rules: {
|
||||
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
|
||||
},
|
||||
},
|
||||
])
|
||||
@@ -0,0 +1,13 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>webui</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.jsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
Generated
+4177
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "webui",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.39.1",
|
||||
"@types/react": "^19.2.2",
|
||||
"@types/react-dom": "^19.2.2",
|
||||
"@vitejs/plugin-react": "^5.1.0",
|
||||
"autoprefixer": "^10.4.22",
|
||||
"eslint": "^9.39.1",
|
||||
"eslint-plugin-react-hooks": "^7.0.1",
|
||||
"eslint-plugin-react-refresh": "^0.4.24",
|
||||
"globals": "^16.5.0",
|
||||
"postcss": "^8.5.6",
|
||||
"tailwindcss": "^3.4.14",
|
||||
"vite": "^7.2.2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
export default {
|
||||
plugins: {
|
||||
tailwindcss: {},
|
||||
autoprefixer: {},
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,42 @@
|
||||
#root {
|
||||
max-width: 1280px;
|
||||
margin: 0 auto;
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.logo {
|
||||
height: 6em;
|
||||
padding: 1.5em;
|
||||
will-change: filter;
|
||||
transition: filter 300ms;
|
||||
}
|
||||
.logo:hover {
|
||||
filter: drop-shadow(0 0 2em #646cffaa);
|
||||
}
|
||||
.logo.react:hover {
|
||||
filter: drop-shadow(0 0 2em #61dafbaa);
|
||||
}
|
||||
|
||||
@keyframes logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
a:nth-of-type(2) .logo {
|
||||
animation: logo-spin infinite 20s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.card {
|
||||
padding: 2em;
|
||||
}
|
||||
|
||||
.read-the-docs {
|
||||
color: #888;
|
||||
}
|
||||
@@ -0,0 +1,241 @@
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useSession } from './context/SessionContext.jsx';
|
||||
|
||||
function StatusBadge({ connected, role, mode }) {
|
||||
const color = connected ? 'bg-emerald-500/20 text-emerald-300' : 'bg-red-500/20 text-red-200';
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-3 text-sm">
|
||||
<span className={`rounded-full px-3 py-1 font-medium ${color}`}>
|
||||
{connected ? 'Connected' : 'Disconnected'}
|
||||
</span>
|
||||
<span className="rounded-full bg-slate-800/80 px-3 py-1 text-slate-200">
|
||||
Role: {role || 'unknown'}
|
||||
</span>
|
||||
<span className="rounded-full bg-slate-800/80 px-3 py-1 text-slate-200">
|
||||
Mode: {mode || '--'}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function LogPanel() {
|
||||
const { logs } = useSession();
|
||||
return (
|
||||
<div className="rounded-2xl border border-slate-800 bg-slate-900/70 p-4">
|
||||
<header className="mb-3 flex items-center justify-between">
|
||||
<h2 className="text-lg font-semibold text-white">Server logs</h2>
|
||||
<span className="text-xs uppercase tracking-[0.2em] text-slate-500">
|
||||
{logs.length} entries
|
||||
</span>
|
||||
</header>
|
||||
<div className="h-64 overflow-y-auto rounded-xl bg-slate-950/40 p-3 text-xs font-mono text-slate-300">
|
||||
{logs.length === 0 ? (
|
||||
<p>No logs yet.</p>
|
||||
) : (
|
||||
logs
|
||||
.slice()
|
||||
.reverse()
|
||||
.map((entry) => (
|
||||
<div key={entry.id} className="mb-2">
|
||||
<span className="text-slate-500">{entry.timestamp}</span>{' '}
|
||||
<span className="text-cyan-300">[{entry.level}]</span>{' '}
|
||||
{entry.label && <span className="text-pink-300">[{entry.label}]</span>}{' '}
|
||||
<span>{entry.message}</span>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function RosterPanel() {
|
||||
const { session, requestControl } = useSession();
|
||||
const roster = session?.roster ?? [];
|
||||
const [pending, setPending] = useState({});
|
||||
|
||||
async function handleRequest(roverId) {
|
||||
setPending((prev) => ({ ...prev, [roverId]: true }));
|
||||
try {
|
||||
await requestControl(roverId);
|
||||
} catch (err) {
|
||||
alert(err.message);
|
||||
} finally {
|
||||
setPending((prev) => ({ ...prev, [roverId]: false }));
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="rounded-2xl border border-slate-800 bg-slate-900/60 p-4">
|
||||
<h2 className="text-lg font-semibold text-white">Rovers</h2>
|
||||
<div className="mt-4 space-y-3">
|
||||
{roster.length === 0 && <p className="text-slate-400">No rovers registered.</p>}
|
||||
{roster.map((rover) => (
|
||||
<div
|
||||
key={rover.id}
|
||||
className="flex flex-wrap items-center justify-between gap-3 rounded-xl bg-slate-950/40 px-4 py-3"
|
||||
>
|
||||
<div>
|
||||
<p className="text-white">{rover.name}</p>
|
||||
<p className="text-xs text-slate-400">Locked: {rover.locked ? 'yes' : 'no'}</p>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleRequest(rover.id)}
|
||||
disabled={pending[rover.id]}
|
||||
className="rounded-full bg-blue-600 px-4 py-1 text-sm font-semibold text-white disabled:opacity-50"
|
||||
>
|
||||
{pending[rover.id] ? 'Requesting…' : 'Request control'}
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function AssignmentCard() {
|
||||
const { session, releaseControl } = useSession();
|
||||
const assignment = session?.assignment;
|
||||
const roverId = assignment?.roverId;
|
||||
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
async function handleRelease() {
|
||||
if (!roverId) return;
|
||||
setBusy(true);
|
||||
try {
|
||||
await releaseControl(roverId);
|
||||
} catch (err) {
|
||||
alert(err.message);
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="rounded-2xl border border-slate-800 bg-slate-900/60 p-4">
|
||||
<h2 className="text-lg font-semibold text-white">Assignment</h2>
|
||||
{roverId ? (
|
||||
<div className="mt-4 space-y-3">
|
||||
<p className="text-slate-300">Currently driving rover {roverId}</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleRelease}
|
||||
disabled={busy}
|
||||
className="rounded-full bg-red-600 px-4 py-1 text-sm font-semibold text-white disabled:opacity-50"
|
||||
>
|
||||
{busy ? 'Releasing…' : 'Release control'}
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="mt-4 text-slate-400">
|
||||
<p>Status: {assignment?.status ?? 'not assigned'}</p>
|
||||
{assignment?.queuePosition && (
|
||||
<p>Queue position: {assignment.queuePosition}</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function SessionInspector() {
|
||||
const { session } = useSession();
|
||||
const formatted = useMemo(() => JSON.stringify(session ?? {}, null, 2), [session]);
|
||||
return (
|
||||
<div className="rounded-2xl border border-slate-800 bg-slate-900/60 p-4">
|
||||
<h2 className="text-lg font-semibold text-white">Session snapshot</h2>
|
||||
<pre className="mt-4 max-h-64 overflow-y-auto text-sm text-teal-200">{formatted}</pre>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function AuthPanel() {
|
||||
const { login, setRole } = useSession();
|
||||
const [username, setUsername] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
async function handleLogin(event) {
|
||||
event.preventDefault();
|
||||
setLoading(true);
|
||||
try {
|
||||
await login(username, password);
|
||||
setUsername('');
|
||||
setPassword('');
|
||||
} catch (err) {
|
||||
alert(err.message);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="rounded-2xl border border-slate-800 bg-slate-900/60 p-4">
|
||||
<h2 className="text-lg font-semibold text-white">Authentication</h2>
|
||||
<form className="mt-4 flex flex-col gap-3" onSubmit={handleLogin}>
|
||||
<input
|
||||
className="rounded-lg border border-slate-800 bg-slate-950/60 px-3 py-2 text-white"
|
||||
placeholder="Username"
|
||||
value={username}
|
||||
onChange={(e) => setUsername(e.target.value)}
|
||||
/>
|
||||
<input
|
||||
className="rounded-lg border border-slate-800 bg-slate-950/60 px-3 py-2 text-white"
|
||||
placeholder="Password"
|
||||
type="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
/>
|
||||
<button
|
||||
type="submit"
|
||||
disabled={loading}
|
||||
className="rounded-lg bg-emerald-600 py-2 font-semibold text-white disabled:opacity-50"
|
||||
>
|
||||
{loading ? 'Logging in…' : 'Login as admin'}
|
||||
</button>
|
||||
</form>
|
||||
<div className="mt-4 flex gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setRole('user')}
|
||||
className="rounded-lg border border-slate-700 px-3 py-1 text-sm text-slate-200"
|
||||
>
|
||||
Driver mode
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setRole('spectator')}
|
||||
className="rounded-lg border border-slate-700 px-3 py-1 text-sm text-slate-200"
|
||||
>
|
||||
Spectator mode
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function App() {
|
||||
const { connected, session } = useSession();
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-slate-950 text-slate-50">
|
||||
<main className="mx-auto flex max-w-6xl flex-col gap-6 px-6 py-10">
|
||||
<header className="space-y-4">
|
||||
<h1 className="text-4xl font-semibold text-white">Multi Roomba Rover Console</h1>
|
||||
<StatusBadge connected={connected} role={session?.role} mode={session?.mode} />
|
||||
</header>
|
||||
<section className="grid gap-6 lg:grid-cols-2">
|
||||
<RosterPanel />
|
||||
<AssignmentCard />
|
||||
<AuthPanel />
|
||||
<SessionInspector />
|
||||
</section>
|
||||
<LogPanel />
|
||||
</main>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
@@ -0,0 +1,96 @@
|
||||
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
|
||||
import { useSocket } from './SocketContext.jsx';
|
||||
|
||||
const SessionContext = createContext({
|
||||
connected: false,
|
||||
session: null,
|
||||
logs: [],
|
||||
login: async () => {},
|
||||
setRole: async () => {},
|
||||
requestControl: async () => {},
|
||||
releaseControl: async () => {},
|
||||
subscribeAll: async () => {},
|
||||
});
|
||||
|
||||
function useAckEmitter(socket) {
|
||||
return useCallback(
|
||||
(event, payload = {}) =>
|
||||
new Promise((resolve, reject) => {
|
||||
socket.emit(event, payload, (resp = {}) => {
|
||||
if (resp.error) {
|
||||
reject(new Error(resp.error));
|
||||
} else {
|
||||
resolve(resp);
|
||||
}
|
||||
});
|
||||
}),
|
||||
[socket],
|
||||
);
|
||||
}
|
||||
|
||||
export function SessionProvider({ children }) {
|
||||
const socket = useSocket();
|
||||
const emitWithAck = useAckEmitter(socket);
|
||||
const [session, setSession] = useState(null);
|
||||
const [logs, setLogs] = useState([]);
|
||||
const [connected, setConnected] = useState(socket.connected);
|
||||
|
||||
useEffect(() => {
|
||||
const onConnect = () => setConnected(true);
|
||||
const onDisconnect = () => setConnected(false);
|
||||
socket.on('connect', onConnect);
|
||||
socket.on('disconnect', onDisconnect);
|
||||
return () => {
|
||||
socket.off('connect', onConnect);
|
||||
socket.off('disconnect', onDisconnect);
|
||||
};
|
||||
}, [socket]);
|
||||
|
||||
useEffect(() => {
|
||||
function handleSession(payload) {
|
||||
setSession(payload);
|
||||
}
|
||||
function handleLogInit(entries = []) {
|
||||
setLogs(entries);
|
||||
}
|
||||
function handleLogEntry(entry) {
|
||||
setLogs((prev) => [...prev.slice(-199), entry]);
|
||||
}
|
||||
socket.on('session:sync', handleSession);
|
||||
socket.on('log:init', handleLogInit);
|
||||
socket.on('log:entry', handleLogEntry);
|
||||
return () => {
|
||||
socket.off('session:sync', handleSession);
|
||||
socket.off('log:init', handleLogInit);
|
||||
socket.off('log:entry', handleLogEntry);
|
||||
};
|
||||
}, [socket]);
|
||||
|
||||
const actions = useMemo(
|
||||
() => ({
|
||||
login: (username, password) => emitWithAck('auth:login', { username, password }),
|
||||
setRole: (role) => emitWithAck('session:setRole', { role }),
|
||||
requestControl: (roverId, options = {}) =>
|
||||
emitWithAck('session:requestControl', { roverId, ...options }),
|
||||
releaseControl: (roverId) => emitWithAck('session:releaseControl', { roverId }),
|
||||
subscribeAll: () => emitWithAck('session:subscribeAll'),
|
||||
}),
|
||||
[emitWithAck],
|
||||
);
|
||||
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
connected,
|
||||
session,
|
||||
logs,
|
||||
...actions,
|
||||
}),
|
||||
[actions, connected, logs, session],
|
||||
);
|
||||
|
||||
return <SessionContext.Provider value={value}>{children}</SessionContext.Provider>;
|
||||
}
|
||||
|
||||
export function useSession() {
|
||||
return useContext(SessionContext);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
// src/context/SocketContext.jsx
|
||||
import { createContext, useContext } from "react";
|
||||
import { socket } from "../lib/socket";
|
||||
|
||||
const SocketContext = createContext(socket);
|
||||
export const SocketProvider = ({ children }) => (
|
||||
<SocketContext.Provider value={socket}>{children}</SocketContext.Provider>
|
||||
);
|
||||
export const useSocket = () => useContext(SocketContext);
|
||||
@@ -0,0 +1,16 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
:root {
|
||||
font-family: 'Inter', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
|
||||
sans-serif;
|
||||
color: #0f172a;
|
||||
background-color: #f8fafc;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
min-height: 100vh;
|
||||
background-color: #0f172a;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
import { io } from "socket.io-client";
|
||||
|
||||
console.log('socket.io client loaded')
|
||||
|
||||
const serverUrl = import.meta.env.VITE_ROVERD_URL ?? "http://localhost:8080";
|
||||
export const socket = io(serverUrl, {
|
||||
transports: ["websocket"], // skip polling if your backend supports it
|
||||
query: {
|
||||
role: "user"
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,16 @@
|
||||
import { StrictMode } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import './index.css'
|
||||
import App from './App.jsx'
|
||||
import { SocketProvider } from './context/SocketContext.jsx'
|
||||
import { SessionProvider } from './context/SessionContext.jsx'
|
||||
|
||||
createRoot(document.getElementById('root')).render(
|
||||
<StrictMode>
|
||||
<SocketProvider>
|
||||
<SessionProvider>
|
||||
<App />
|
||||
</SessionProvider>
|
||||
</SocketProvider>
|
||||
</StrictMode>,
|
||||
)
|
||||
@@ -0,0 +1,11 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
export default {
|
||||
content: [
|
||||
"./index.html",
|
||||
"./src/**/*.{js,ts,jsx,tsx}",
|
||||
],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
build: {
|
||||
outDir: '../server/public',
|
||||
emptyOutDir: true,
|
||||
},
|
||||
})
|
||||
Reference in New Issue
Block a user