Refactor camera feed handling to support dynamic camera IDs and improve context management

This commit is contained in:
2025-12-17 14:19:23 +00:00
parent cc8b3a5691
commit 775fce7900
19 changed files with 211 additions and 248 deletions

View File

@@ -3,18 +3,28 @@ import { WebsocketContext, type WebSocketConextValue } from "../context/WebSocke
import useWebSocket from "react-use-websocket";
import { wsConfig } from "../config/wsconfig";
import type { CameraZoomData, InfoBarData } from "../../types/types";
import { CAMERA_IDS } from "../config/cameraConfig";
import { CAMBASE_WS } from "../../utils/config";
import { useCameraFeedContext } from "../context/CameraFeedContext";
type WebSocketProviderProps = {
children: ReactNode;
};
export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
const { state } = useCameraFeedContext();
const [systemData, setSystemData] = useState<InfoBarData | null>(null);
const [socketData, setSocketData] = useState<CameraZoomData | null>(null);
const infoSocket = useWebSocket(wsConfig.infoBar, { share: true, shouldReconnect: () => true });
const cameraFeedASocket = useWebSocket(wsConfig.cameraFeedA, { share: true, shouldReconnect: () => true });
const cameraFeedBSocket = useWebSocket(wsConfig.cameraFeedB, { share: true, shouldReconnect: () => true });
const cameraFeedCSocket = useWebSocket(wsConfig.cameraFeedC, { share: true, shouldReconnect: () => true });
const sockets = CAMERA_IDS.reduce(
(acc, id) => {
acc[id] = `${CAMBASE_WS}/websocket-Camera${id}-live-video`;
return acc;
},
{} as Record<string, string>,
);
const cameraFeedID = state.cameraFeedID;
const cameraFeed = useWebSocket(sockets[cameraFeedID], { share: true, shouldReconnect: () => true });
useEffect(() => {
async function parseData() {
@@ -23,20 +33,15 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
const data = JSON.parse(text);
setSystemData(data);
}
if (cameraFeedASocket.lastMessage || cameraFeedBSocket.lastMessage || cameraFeedCSocket.lastMessage) {
const message = cameraFeedASocket.lastMessage || cameraFeedBSocket.lastMessage || cameraFeedCSocket.lastMessage;
if (cameraFeed.lastMessage) {
const message = cameraFeed.lastMessage;
const data = await message?.data.text();
const parsedData: CameraZoomData = JSON.parse(data || "");
setSocketData(parsedData);
}
}
parseData();
}, [
cameraFeedASocket.lastMessage,
cameraFeedBSocket.lastMessage,
cameraFeedCSocket.lastMessage,
infoSocket.lastMessage,
]);
}, [cameraFeed.lastMessage, infoSocket.lastMessage]);
const value = useMemo<WebSocketConextValue>(
() => ({
@@ -45,32 +50,16 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
readyState: infoSocket.readyState,
sendJson: infoSocket.sendJsonMessage,
},
cameraFeedA: {
cameraFeed: {
data: socketData,
readyState: cameraFeedASocket.readyState,
readyState: cameraFeed.readyState,
send: cameraFeedASocket.sendMessage,
},
cameraFeedB: {
data: socketData,
readyState: cameraFeedBSocket.readyState,
send: cameraFeedBSocket.sendMessage,
},
cameraFeedC: {
data: socketData,
readyState: cameraFeedCSocket.readyState,
send: cameraFeedCSocket.sendMessage,
send: cameraFeed.sendMessage,
},
}),
[
cameraFeedASocket.readyState,
cameraFeedASocket.sendMessage,
cameraFeedBSocket.readyState,
cameraFeedBSocket.sendMessage,
cameraFeedCSocket.readyState,
cameraFeedCSocket.sendMessage,
cameraFeed.readyState,
cameraFeed.sendMessage,
infoSocket.readyState,
infoSocket.sendJsonMessage,
socketData,