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

slopfixing queue stuffs

Browse Source
This commit is contained in:
legop3
2026-07-21 23:38:57 -04:00
parent b26daed93f
commit 3a26b4871a
10 changed files with 218 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webui/src/components/HudOverlays/TurnsOverlay/index.jsx
+13 -1
View File
@@ -88,6 +88,15 @@ function TurnsOverlay({
if (!isTurnsMode || !isActiveDriver) return null;
return turnSeconds != null ? `${turnSeconds}s left` : 'Your turn';
}, [isTurnsMode, isActiveDriver, turnSeconds]);
const idleTimerText = useMemo(() => {
/*
Idle grace is independent from the full turn deadline. Rendering it in
the persistent corner status means initial page loads and reconnects get
the same warning as users who happened to see the large handoff cue.
*/
if (!isTurnsMode || !isActiveDriver || idleSkipSeconds == null) return null;
return `Idle skip in ${idleSkipSeconds}s`;
}, [idleSkipSeconds, isActiveDriver, isTurnsMode]);
const notTurnCountdownText = useMemo(() => {
if (!showNotTurnNotice || !isNextDriver || turnSeconds == null) return null;
return `${turnSeconds} seconds until your turn.`;
@@ -230,13 +239,16 @@ function TurnsOverlay({
{turnTimerText ? (
<div
className={`pointer-events-none absolute bottom-1 left-1 rounded border ${
className={`pointer-events-none absolute bottom-1 left-1 flex flex-col rounded border ${
turnTimerFlashActive
? 'border-red-300/90 bg-red-900/80 text-red-100'
: 'border-amber-300/80 bg-black/75 text-amber-200'
} ${timerPadClass} ${timerTextClass}`}
>
{turnTimerText}
{idleTimerText ? (
<span className="font-semibold text-red-200">{idleTimerText}</span>
) : null}
</div>
) : null}
webui/src/components/RoverQueuesPanel/index.jsx
+23 -5
View File
@@ -249,9 +249,20 @@ export default function RoverQueuesPanel({
const roverId = String(rover.id);
const info = turnQueues?.[roverId] || null;
const queue = info?.queue || [];
const deadline = info?.idleDeadline || info?.deadline || null;
const remainingSeconds =
deadline && deadline > now ? Math.ceil((deadline - now) / 1000) : deadline ? 0 : null;
/*
A turn handoff and an inactivity skip are separate server
deadlines. Keep them separate through formatting so an idle
warning cannot masquerade as the length of the whole turn or
jump from seven seconds back to the turn countdown.
*/
const turnDeadline = info?.deadline || null;
const idleDeadline = info?.idleDeadline || null;
const turnRemainingSeconds = turnDeadline
? Math.max(0, Math.ceil((turnDeadline - now) / 1000))
: null;
const idleRemainingSeconds = idleDeadline
? Math.max(0, Math.ceil((idleDeadline - now) / 1000))
: null;
const currentId = info?.current || null;
const currentIdx = currentId ? queue.findIndex((id) => id === currentId) : -1;
const nextId =
@@ -262,7 +273,14 @@ export default function RoverQueuesPanel({
: null;
const isSelfCurrent = Boolean(selfId && currentId && currentId === selfId);
const isSelfNext = Boolean(selfId && nextId && nextId === selfId);
const showTimer = remainingSeconds != null && (isSelfCurrent || isSelfNext);
const timerLabel = isSelfCurrent
? [
turnRemainingSeconds != null ? `${turnRemainingSeconds}s left` : '',
idleRemainingSeconds != null ? `Idle skip in ${idleRemainingSeconds}s` : '',
].filter(Boolean).join(' · ')
: isSelfNext && turnRemainingSeconds != null
? `Your turn in ${turnRemainingSeconds}s`
: '';
const isPrivateOpen = Boolean(rover?.private?.enabled && rover?.private?.open);
const isGrantedClosedPrivate = Boolean(rover?.private?.enabled && !rover?.private?.open);
const locked = Boolean(rover.locked);
@@ -293,7 +311,7 @@ export default function RoverQueuesPanel({
buttonLabel={buttonLabel}
batteryLabel={formatBattery(rover)}
batteryClassName={batteryClass(rover)}
timerLabel={showTimer ? (isSelfCurrent ? `${remainingSeconds}s left` : `Your turn in ${remainingSeconds}s`) : ''}
timerLabel={timerLabel}
thumbnailUrl={externalMode ? rover?.snapshots?.latestUrl : ''}
onRequest={handleRequest}
showAction={Boolean(canRequest)}