Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

Trying to catch SkellyCamAppState

jonmatthis5cfad5b59b6c
diff --git a/freemocap-ui/src/components/ui-components/Sidebar.tsx b/freemocap-ui/src/components/ui-components/Sidebar.tsx
index fcbb1f5b..8c74a8f9 100644
--- a/freemocap-ui/src/components/ui-components/Sidebar.tsx
+++ b/freemocap-ui/src/components/ui-components/Sidebar.tsx
@@ -16,7 +16,7 @@ const sidebarItems = [
children: [
{
id: '3d Viewport',
- route: '/viewport3d'
+ route: '/'
},
{
id: 'Camera Views',
diff --git a/freemocap-ui/src/context/WebSocketContext.tsx b/freemocap-ui/src/context/WebSocketContext.tsx
index 93926541..a1967b74 100644
--- a/freemocap-ui/src/context/WebSocketContext.tsx
+++ b/freemocap-ui/src/context/WebSocketContext.tsx
@@ -2,10 +2,12 @@ import React, {createContext, ReactNode, useContext} from "react";
import {useWebSocket} from "@/hooks/useWebSocket";
import {z} from "zod";
import {FrontendFramePayloadSchema, JpegImagesSchema, Points3dSchema} from "@/models/FrontendFramePayloadSchema";
+import {SkellyCamAppStateSchema} from "@/models/SkellyCamAppStateSchema";
interface WebSocketContextProps {
isConnected: boolean;
latestFrontendPayload: z.infer<typeof FrontendFramePayloadSchema> | null;
+ latestSkellyCamAppState: z.infer<typeof SkellyCamAppStateSchema> | null;
latestImages:z.infer<typeof JpegImagesSchema> |null;
latestPoints3d: z.infer<typeof Points3dSchema> | null;
connect: () => void;
@@ -20,10 +22,10 @@ interface WebSocketProviderProps {
const WebSocketContext = createContext<WebSocketContextProps | undefined>(undefined);
export const WebSocketProvider: React.FC<WebSocketProviderProps> = ({url, children}) => {
- const {isConnected, latestFrontendPayload, latestImages, latestPoints3d, connect, disconnect} = useWebSocket(url);
+ const {isConnected, latestFrontendPayload, latestImages, latestPoints3d, latestSkellyCamAppState, connect, disconnect} = useWebSocket(url);
return (
- <WebSocketContext.Provider value={{isConnected, latestFrontendPayload,latestImages, latestPoints3d, connect, disconnect}}>
+ <WebSocketContext.Provider value={{isConnected, latestFrontendPayload,latestImages, latestPoints3d, latestSkellyCamAppState, connect, disconnect}}>
{children}
</WebSocketContext.Provider>
)
diff --git a/freemocap-ui/src/hooks/useWebSocket.ts b/freemocap-ui/src/hooks/useWebSocket.ts
index 540f7544..34eb71f5 100644
--- a/freemocap-ui/src/hooks/useWebSocket.ts
+++ b/freemocap-ui/src/hooks/useWebSocket.ts
@@ -1,12 +1,14 @@
import {useCallback, useEffect, useState} from 'react';
import {z} from 'zod';
import {FrontendFramePayloadSchema, JpegImagesSchema, Points3dSchema} from "@/models/FrontendFramePayloadSchema";
+import {SkellyCamAppStateSchema} from "@/models/SkellyCamAppStateSchema";
const MAX_RECONNECT_ATTEMPTS = 20;
export const useWebSocket = (wsUrl: string) => {
const [isConnected, setIsConnected] = useState(false);
const [latestFrontendPayload, setLatestFrontendPayload] = useState<z.infer<typeof FrontendFramePayloadSchema> | null>(null);
+ const [latestSkellyCamAppState, setLatestSkellyCamAppState] = useState<z.infer<typeof SkellyCamAppStateSchema> | null>(null);
const [latestImages, setLatestImages] = useState<z.infer<typeof JpegImagesSchema> | null>(null);
const [latestPoints3d, setLatestPoints3d] = useState<z.infer<typeof Points3dSchema> | null>(null);
@@ -29,19 +31,28 @@ export const useWebSocket = (wsUrl: string) => {
const parseAndValidateMessage = (data: string) => {
try {
const parsedData = JSON.parse(data);
- const frontendImagePayload = FrontendFramePayloadSchema.parse(parsedData);
- setLatestFrontendPayload(frontendImagePayload);
- setLatestImages(frontendImagePayload.jpeg_images)
- setLatestPoints3d(frontendImagePayload.points3d)
+
+ if (parsedData.type === 'FrontendFramePayload') {
+ const frontendImagePayload = FrontendFramePayloadSchema.parse(parsedData);
+ setLatestFrontendPayload(frontendImagePayload);
+ setLatestImages(frontendImagePayload.jpeg_images);
+ setLatestPoints3d(frontendImagePayload.points3d);
+ } else if (parsedData.type === 'SkellycamAppStateDTO') {
+ const skellycamAppState = SkellyCamAppStateSchema.parse(parsedData);
+ setLatestSkellyCamAppState(skellycamAppState);
+ } else {
+ console.warn('Received unknown message type:', parsedData.type);
+ }
} catch (e) {
if (e instanceof z.ZodError) {
- console.error('Validation failed with errors:', JSON.stringify(e.errors,null,2));
+ console.error('Validation failed with errors:', JSON.stringify(e.errors, null, 2));
} else {
console.error('Error parsing message data:', e);
}
}
};
+
const connect = useCallback(() => {
if (websocket && websocket.readyState !== WebSocket.CLOSED) {
return;
@@ -93,5 +104,5 @@ export const useWebSocket = (wsUrl: string) => {
};
}, [connect]);
- return {isConnected, latestFrontendPayload, latestImages, latestPoints3d, connect, disconnect};
+ return {isConnected, latestFrontendPayload, latestImages, latestPoints3d, latestSkellyCamAppState ,connect, disconnect};
};
diff --git a/freemocap-ui/src/layout/routing/router.tsx b/freemocap-ui/src/layout/routing/router.tsx
index 0b38b49d..c1b3ae76 100644
--- a/freemocap-ui/src/layout/routing/router.tsx
+++ b/freemocap-ui/src/layout/routing/router.tsx
@@ -3,7 +3,7 @@ import {Route, Routes} from "react-router-dom";
import {ConfigView} from "@/views/Config";
import {BrowserCamerasView} from "@/views/BrowserCamerasView";
import {PythonToJsTest} from "@/views/PythonToJsTest";
-import {PythonCamerasView} from "@/views/PythonCamerasView";
+import {CamerasView} from "@/views/CamerasView";
import {DefaultView} from "@/views/Default";
import WebsocketConnectionStatus from "@/components/ui-components/WebsocketConnectionStatus";
import {Viewport3d} from "@/views/Viewport3d";
@@ -12,12 +12,9 @@ export const Router = () => {
return (
<Routes>
<Route path={'/'} element={<Viewport3d />} />
- {/*<Route path={'/default'} element={<DefaultView/>}/>*/}
<Route path={'/config'} element={<ConfigView/>}/>
- {/*<Route path={'/jontestplayground'} element={<BrowserCamerasView/>}/>*/}
- {/*<Route path={'/pythonToJs'} element={<PythonToJsTest/>}/>*/}
- <Route path={'/show_cameras'} element={<PythonCamerasView/>}/>
- <Route path={'/viewport3d'} element={<Viewport3d />} />
+ <Route path={'/show_cameras'} element={<CamerasView/>}/>
+ {/*<Route path={'/viewport3d'} element={<Viewport3d />} />*/}
<Route path={'/websocketConnection'} element={<WebsocketConnectionStatus/>}/>
</Routes>
)
diff --git a/freemocap-ui/src/models/FrontendFramePayloadSchema.ts b/freemocap-ui/src/models/FrontendFramePayloadSchema.ts
index cf11e94a..331dd1af 100644
--- a/freemocap-ui/src/models/FrontendFramePayloadSchema.ts
+++ b/freemocap-ui/src/models/FrontendFramePayloadSchema.ts
@@ -27,3 +27,5 @@ export const FrontendFramePayloadSchema = z.object({
latest_pipeline_output: z.any(), // Allow any value for latest_pipeline_output
points3d: Points3dSchema // Add the Points3DSchema
});
+
+
diff --git a/freemocap-ui/src/views/PythonCamerasView.tsx b/freemocap-ui/src/views/CamerasView.tsx
similarity index 96%
rename from freemocap-ui/src/views/PythonCamerasView.tsx
rename to freemocap-ui/src/views/CamerasView.tsx
index 60a76ab4..9dab6d32 100644
--- a/freemocap-ui/src/views/PythonCamerasView.tsx
+++ b/freemocap-ui/src/views/CamerasView.tsx
@@ -4,7 +4,7 @@ import { useWebSocketContext } from "@/context/WebSocketContext";
import {CameraImagesGrid} from "@/components/camera-views/CameraImagesGrid";
-export const PythonCamerasView = () => {
+export const CamerasView = () => {
const {latestImages} = useWebSocketContext();
const [showAnnotation, setShowAnnotation] = useState(true);
const toggleAnnotation = () => {
diff --git a/freemocap-ui/src/views/Config.tsx b/freemocap-ui/src/views/Config.tsx
index e436b833..3b3d1be2 100644
--- a/freemocap-ui/src/views/Config.tsx
+++ b/freemocap-ui/src/views/Config.tsx
@@ -1,26 +1,34 @@
-import {Box, Typography} from "@mui/material";
+import { Box, Typography } from "@mui/material";
import React from "react";
-import {useAsync} from "react-use";
-import {AvailableCameraDevices} from "@/services/detectCameraDevices";
+import { useAsync } from "react-use";
+import { AvailableCameraDevices } from "@/services/detectCameraDevices";
+import { useWebSocketContext } from "@/context/WebSocketContext";
export const ConfigView = () => {
- const [Container] = [Box, Box];
- const [devices, setDevices] = React.useState<MediaDeviceInfo[]>([]);
- useAsync(async () => {
- const cam = new AvailableCameraDevices();
- const deviceInfos = await cam.findAllCameras( false);
- setDevices(deviceInfos)
- });
- const devicesWithNames = devices.filter(x => x.label);
- return (
- <Container>
- <Typography>Configuration</Typography>
- {devicesWithNames
- .map(device => {
- return (
- <Typography>Webcam {device.label}</Typography>
- )
- })}
- </Container>
- )
+ const [devices, setDevices] = React.useState<MediaDeviceInfo[]>([]);
+ const { latestSkellyCamAppState } = useWebSocketContext();
+
+ useAsync(async () => {
+ const cam = new AvailableCameraDevices();
+ const deviceInfos = await cam.findAllCameras(false);
+ setDevices(deviceInfos);
+ }, []); // Adding an empty dependency array to ensure this runs once on component mount
+
+ const devicesWithNames = devices.filter(x => x.label);
+
+ return (
+ <Box>
+ <Typography>JS Detected Cameras</Typography>
+ {devicesWithNames.map(device => (
+ <Typography key={device.deviceId}>Webcam {device.label}</Typography>
+ ))}
+
+ <Typography>Latest SkellyCamAppState</Typography>
+ {latestSkellyCamAppState && (
+ <Typography component="pre">
+ {JSON.stringify(latestSkellyCamAppState, null, 2)}
+ </Typography>
+ )}
+ </Box>
+ );
}