awa

webui/src/spectate/SpectatorApp/SpectatorContent.jsx

@@ -2,9 +2,6 @@
 // Purpose: Defines the Spectator Content module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import { useSession } from '../../context/SessionContext.jsx';
-import { useTelemetryFrames } from '../../context/TelemetryContext.jsx';
-import { useVideoRequests } from '../../hooks/useVideoRequests.js';
-import { useRoverSnapshots } from '../../hooks/useRoverSnapshots.js';
 import { useSpectatorMode } from '../../hooks/useSpectatorMode.js';
 import useDefaultNickname from '../../hooks/useDefaultNickname.js';
 import ChatPanel from '../../components/ChatPanel/index.jsx';
@@ -22,29 +19,10 @@ import LogsRow from './components/LogsRow.jsx';
 export default function SpectatorContent() {
   const { session } = useSession();
   const inLockdown = session?.mode === 'lockdown';
-  const canSpectateVideo = Boolean(session?.isLocalNetwork);
   useDefaultNickname();
   useSpectatorMode();
   const isPortraitLayout = usePortraitLayout();
-  const frames = useTelemetryFrames();
   const roster = session?.roster ?? [];
-  const snapshotFeeds = useRoverSnapshots(
-    roster.map((rover) => rover.id),
-    { enabled: !inLockdown && !canSpectateVideo, version: session?.mode },
-  );
-  const videoEntries = canSpectateVideo
-    ? roster.map((rover) => ({ type: 'rover', id: rover.id, key: rover.id }))
-    : [];
-  const videoSources = useVideoRequests(videoEntries, {
-    enabled: !inLockdown && canSpectateVideo,
-    version: session?.mode,
-  });
-  const audioEntries = roster.flatMap((rover) =>
-    rover.media?.audioPublishUrl
-      ? [{ type: 'rover', id: `${rover.id}-audio`, key: `${rover.id}-audio` }]
-      : [],
-  );
-  const audioSources = useVideoRequests(audioEntries, { enabled: !inLockdown, version: session?.mode });
 
   if (inLockdown) {
     return (
@@ -105,15 +83,7 @@ export default function SpectatorContent() {
           </div>
         </section>
         <section className={contentClass}>
-          <RoverRow
-            roster={roster}
-            frames={frames}
-            videoSources={videoSources}
-            snapshotFeeds={snapshotFeeds}
-            audioSources={audioSources}
-            session={session}
-            canSpectateVideo={canSpectateVideo}
-          />
+          <RoverRow roster={roster} />
           <SecondaryRow />
         </section>
       </main>

webui/src/spectate/SpectatorApp/components/RoverRow.jsx

@@ -3,25 +3,14 @@
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import RoverSpectatorCard from './RoverSpectatorCard.jsx';
 
-export default function RoverRow({ roster, frames, videoSources, snapshotFeeds, audioSources, session, canSpectateVideo }) {
+export default function RoverRow({ roster }) {
   if (roster.length === 0) {
     return <p className="col-span-full text-slate-400">No rovers registered.</p>;
   }
   return (
     <section className="grid grid-cols-1 gap-0.5 md:grid-cols-2">
       {roster.map((rover) => (
-        <RoverSpectatorCard
-          key={rover.id}
-          rover={rover}
-          frame={frames[rover.id]}
-          sessionInfo={canSpectateVideo ? videoSources[rover.id] || null : null}
-          videoMode={canSpectateVideo ? 'whep' : 'snapshot'}
-          snapshotFeed={canSpectateVideo ? null : snapshotFeeds[rover.id]}
-          audioInfo={audioSources[`${rover.id}-audio`]}
-          session={session}
-          showHudMap
-          hudMapPosition="bottom-left"
-        />
+        <RoverSpectatorCard key={rover.id} rover={rover} />
       ))}
     </section>
   );

webui/src/spectate/SpectatorApp/components/RoverSpectatorCard.jsx

@@ -1,28 +1,15 @@
 // Rover Spectator Card
 // Purpose: Defines the Rover Spectator Card module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
-import VideoTile from '../../../components/VideoTile/index.jsx';
-import { formatDriverLabel } from '../utils.js';
+import SpectateVideo from '../../../components/SpectateVideo/index.jsx';
 
-export default function RoverSpectatorCard({ rover, frame, sessionInfo, videoMode, snapshotFeed, audioInfo, session }) {
-  const driverLabel = formatDriverLabel({ roverId: rover.id, session });
+export default function RoverSpectatorCard({ rover }) {
   return (
     <article className="min-h-[16rem] rounded bg-zinc-900 p-0 sm:min-h-[18rem]">
       <div className="min-h-0 overflow-hidden rounded bg-black/20">
-        <VideoTile
-          sessionInfo={sessionInfo}
-          videoMode={videoMode}
-          snapshotFeed={snapshotFeed}
-          audioSessionInfo={audioInfo}
+        <SpectateVideo
+          roverId={rover.id}
           label={rover.name}
-          roverDescription={rover.description}
-          roverColor={rover.color || null}
-          telemetryFrame={frame}
-          batteryConfig={rover.battery}
-          hudVariant="spectator"
-          driverLabel={driverLabel}
-          hudForceMap
-          hudMapPosition="top-center"
         />
       </div>
     </article>