mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-11-16 19:52:17 -05:00
pause ptz turns when no ones on
This commit is contained in:
@@ -121,7 +121,7 @@ function describeParticipation(socket) {
|
|||||||
color: cameraConfig.color || DEFAULT_PTZ_COLOR,
|
color: cameraConfig.color || DEFAULT_PTZ_COLOR,
|
||||||
fallback: null,
|
fallback: null,
|
||||||
},
|
},
|
||||||
enabled: entered && (isOperator || position > 0),
|
enabled: entered && (isOperator || position > 0) && participation.state.queue.length > 0,
|
||||||
isActive: isOperator,
|
isActive: isOperator,
|
||||||
turnsAhead: isOperator ? 0 : position || null,
|
turnsAhead: isOperator ? 0 : position || null,
|
||||||
queueLength: participation.state.queue.length + (participation.state.operatorSocketId ? 1 : 0),
|
queueLength: participation.state.queue.length + (participation.state.operatorSocketId ? 1 : 0),
|
||||||
|
|||||||
@@ -22,19 +22,27 @@ function createParticipation({ io, events, emitChange, getTurnDurationMs, canPar
|
|||||||
}
|
}
|
||||||
|
|
||||||
function scheduleTurn() {
|
function scheduleTurn() {
|
||||||
clearTimeout(timer);
|
// Uncontested control has no deadline. Starting a new wait gets a full turn,
|
||||||
|
// while later queue changes must not reset an already running countdown.
|
||||||
|
if (!state.operatorSocketId || !state.queue.length) {
|
||||||
|
clearTimeout(timer);
|
||||||
|
timer = null;
|
||||||
|
state.deadline = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (timer) return;
|
||||||
const duration = getTurnDurationMs();
|
const duration = getTurnDurationMs();
|
||||||
state.deadline = Date.now() + duration;
|
state.deadline = Date.now() + duration;
|
||||||
timer = setTimeout(() => {
|
timer = setTimeout(() => {
|
||||||
// An expired operator stays when alone, but is not automatically requeued
|
timer = null;
|
||||||
// when another participant takes over. Preserve the existing PTZ rule.
|
state.queue = state.queue.filter(eligible);
|
||||||
state.queue = state.queue.filter((id) => eligible(id));
|
|
||||||
if (state.queue.length) {
|
if (state.queue.length) {
|
||||||
|
// Preserve PTZ's explicit request-to-rejoin rule after a handoff.
|
||||||
stopOperator('turn-expired');
|
stopOperator('turn-expired');
|
||||||
advance('turn-expired');
|
advance('turn-expired');
|
||||||
} else {
|
} else {
|
||||||
scheduleTurn();
|
scheduleTurn();
|
||||||
emitChange('turn-extended-empty-queue');
|
emitChange('turn-uncontested');
|
||||||
}
|
}
|
||||||
}, duration);
|
}, duration);
|
||||||
}
|
}
|
||||||
@@ -45,14 +53,15 @@ function createParticipation({ io, events, emitChange, getTurnDurationMs, canPar
|
|||||||
}
|
}
|
||||||
|
|
||||||
function advance(reason) {
|
function advance(reason) {
|
||||||
|
state.queue = state.queue.filter(eligible);
|
||||||
while (!state.operatorSocketId && state.queue.length) {
|
while (!state.operatorSocketId && state.queue.length) {
|
||||||
const next = state.queue.shift();
|
const next = state.queue.shift();
|
||||||
if (!eligible(next)) continue;
|
if (!eligible(next)) continue;
|
||||||
state.operatorSocketId = next;
|
state.operatorSocketId = next;
|
||||||
state.generation += 1;
|
state.generation += 1;
|
||||||
scheduleTurn();
|
|
||||||
events.emit('operator', { socketId: next, action: 'active' });
|
events.emit('operator', { socketId: next, action: 'active' });
|
||||||
}
|
}
|
||||||
|
scheduleTurn();
|
||||||
emitChange(reason);
|
emitChange(reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ function PtzDesktopFullscreen({ ptz, releasePending }) {
|
|||||||
</aside>
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
<div className="grid min-h-0 grid-cols-[minmax(0,1.6fr)_minmax(16rem,0.7fr)] gap-0.5 overflow-hidden">
|
<div className="grid min-h-0 grid-cols-[minmax(0,1.6fr)_minmax(16rem,0.7fr)] gap-0.5 overflow-hidden">
|
||||||
<ChatPanel fillHeight title="Chat" allowSpectatorInput inputTarget="overlay" />
|
<ChatPanel fillHeight title="Chat" allowSpectatorInput />
|
||||||
<PtzPresetPanel ptz={ptz} />
|
<PtzPresetPanel ptz={ptz} />
|
||||||
</div>
|
</div>
|
||||||
{releasePending ? (
|
{releasePending ? (
|
||||||
@@ -105,7 +105,7 @@ function PtzMobileLandscape({ ptz, onClose, releasePending = false }) {
|
|||||||
</aside>
|
</aside>
|
||||||
</section>
|
</section>
|
||||||
<section className="grid gap-0.5 md:grid-cols-[minmax(0,1fr)_minmax(0,0.7fr)]">
|
<section className="grid gap-0.5 md:grid-cols-[minmax(0,1fr)_minmax(0,0.7fr)]">
|
||||||
<ChatPanel title="Chat" allowSpectatorInput inputTarget="overlay" />
|
<ChatPanel title="Chat" allowSpectatorInput />
|
||||||
<PtzPresetPanel ptz={ptz} />
|
<PtzPresetPanel ptz={ptz} />
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
@@ -150,7 +150,7 @@ function PtzMobilePortrait({ ptz, onClose, releasePending = false }) {
|
|||||||
<PtzPresetPanel ptz={ptz} />
|
<PtzPresetPanel ptz={ptz} />
|
||||||
</div>
|
</div>
|
||||||
<PtzQueueSummary ptz={ptz} />
|
<PtzQueueSummary ptz={ptz} />
|
||||||
<ChatPanel title="Chat" allowSpectatorInput inputTarget="overlay" />
|
<ChatPanel title="Chat" allowSpectatorInput />
|
||||||
{/* Portrait keeps room lights immediately after chat as requested. */}
|
{/* Portrait keeps room lights immediately after chat as requested. */}
|
||||||
<HomeAssistantControls />
|
<HomeAssistantControls />
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import PtzLiveVideo, { PTZ_CAMERA_ID } from '../../components/PtzLiveVideo/index.jsx';
|
import PtzLiveVideo, { PTZ_CAMERA_ID } from '../../components/PtzLiveVideo/index.jsx';
|
||||||
|
import ChatExpansion from '../../components/HudOverlays/newgen/CornerPods/ChatExpansion.jsx';
|
||||||
import TopLeftPod from '../../components/HudOverlays/newgen/CornerPods/TopLeftPod.jsx';
|
import TopLeftPod from '../../components/HudOverlays/newgen/CornerPods/TopLeftPod.jsx';
|
||||||
import { usePtzCameraSnapshots } from '../../hooks/usePtzCameraSnapshot.js';
|
import { usePtzCameraSnapshots } from '../../hooks/usePtzCameraSnapshot.js';
|
||||||
function PtzSnapshotPreview({ feed, label = 'PTZ Camera', className = 'h-full w-full' }) {
|
function PtzSnapshotPreview({ feed, label = 'PTZ Camera', className = 'h-full w-full' }) {
|
||||||
@@ -35,6 +36,7 @@ function PtzMediaPane({ ptz, open, framed = true, compact = false }) {
|
|||||||
<PtzSnapshotPreview feed={snapshot} label={ptz?.name || 'PTZ Camera'} />
|
<PtzSnapshotPreview feed={snapshot} label={ptz?.name || 'PTZ Camera'} />
|
||||||
)}
|
)}
|
||||||
{ptz?.turn ? <TopLeftPod compact={compact} turns={ptz.turn} /> : null}
|
{ptz?.turn ? <TopLeftPod compact={compact} turns={ptz.turn} /> : null}
|
||||||
|
<ChatExpansion podOpen={false} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user