Skip to content

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

TypeScript

ok, i think the ws stuff is getting there?

jonmatthisdadf8a0d7942
diff --git a/freemocap-ui/src/App.tsx b/freemocap-ui/src/App.tsx
index 5b30994d..a4738248 100644
--- a/freemocap-ui/src/App.tsx
+++ b/freemocap-ui/src/App.tsx
@@ -1,25 +1,17 @@
import React from 'react';
import {Paperbase} from "@/layout/paperbase_theme.tsx/Paperbase";
-import {useWebSocket} from '@/hooks/useWebsocket';
+import {WebSocketProvider} from "@/context/WebSocketContext";
+
function App() {
const _port = 8005;
- const wsURL = `ws://localhost:${_port}/skellycam/websocket/connect`;
- const {isConnected, messages} = useWebSocket(wsURL);
+ const wsUrl = `ws://localhost:${_port}/skellycam/websocket/connect`;
return (
- <React.Fragment>
- <div>
- <h1>WebSocket Connection</h1>
- <p>Connected: {isConnected ? 'true' : 'false'}</p>
- <h2>Messages</h2>
- <ul>
- {messages.map((message, index) => (
- <li key={index}>{message}</li>
- ))}
- </ul>
- </div>
- <Paperbase/>
- </React.Fragment>
+ <WebSocketProvider url={wsUrl}>
+ <React.Fragment>
+ <Paperbase/>
+ </React.Fragment>
+ </WebSocketProvider>
);
}
diff --git a/freemocap-ui/src/context/WebSocketContext.tsx b/freemocap-ui/src/context/WebSocketContext.tsx
new file mode 100644
index 00000000..7ca5059b
--- /dev/null
+++ b/freemocap-ui/src/context/WebSocketContext.tsx
@@ -0,0 +1,32 @@
+import React, {createContext, useContext, ReactNode} from "react";
+import {useWebSocket} from "@/hooks/useWebSocket";
+
+interface WebSocketContextProps {
+ isConnected: boolean;
+ messages: string[];
+ connect: () => void;
+ disconnect: () => void;
+}
+interface WebSocketProviderProps {
+ url: string;
+ children: ReactNode;
+}
+const WebSocketContext = createContext<WebSocketContextProps | undefined>(undefined);
+
+export const WebSocketProvider: React.FC<WebSocketProviderProps> = ({url, children}) => {
+ const {isConnected, messages, connect, disconnect} = useWebSocket(url);
+
+ return(
+ <WebSocketContext.Provider value={{isConnected, messages, connect, disconnect}}>
+ {children}
+ </WebSocketContext.Provider>
+ )
+}
+
+export const useWebSocketContext = () => {
+ const context = useContext(WebSocketContext);
+ if (!context) {
+ throw new Error('useWebSocketContext must be used within a WebSocketProvider');
+ }
+ return context;
+};
diff --git a/freemocap-ui/src/hooks/useWebSocket.ts b/freemocap-ui/src/hooks/useWebSocket.ts
new file mode 100644
index 00000000..badd3337
--- /dev/null
+++ b/freemocap-ui/src/hooks/useWebSocket.ts
@@ -0,0 +1,63 @@
+import {useCallback, useEffect, useState} from 'react';
+
+const MAX_RECONNECT_ATTEMPTS = 20;
+
+export const useWebSocket = (wsUrl: string) => {
+ const [isConnected, setIsConnected] = useState(false);
+ const [messages, setMessages] = useState<string[]>([]);
+ const [websocket, setWebSocket] = useState<WebSocket | null>(null);
+ const [connectAttempt, setConnectAttempt] = useState(0);
+
+ const connect = useCallback(() => {
+ if (websocket && websocket.readyState !== WebSocket.CLOSED) {
+ return;
+ }
+ if (connectAttempt >= MAX_RECONNECT_ATTEMPTS) {
+ console.error(`Max reconnection attempts reached. Could not connect to ${wsUrl}`);
+ return;
+ }
+ const ws = new WebSocket(wsUrl);
+
+ ws.onopen = () => {
+ setIsConnected(true);
+ setConnectAttempt(0);
+ console.log(`Websocket is connected to url: ${wsUrl}`)
+ };
+
+ ws.onclose = () => {
+ setIsConnected(false);
+ setConnectAttempt(prev => prev + 1);
+ };
+
+ ws.onmessage = (event) => {
+ console.log('Websocket message received with length: ', event.data.length);
+ setMessages(prevMessages => [...prevMessages, event.data]);
+ };
+
+ ws.onerror = (error) => {
+ console.error('Websocket error:', error);
+ };
+
+ setWebSocket(ws);
+ }, [wsUrl, websocket, connectAttempt]);
+
+ const disconnect = useCallback(()=>{
+ if (websocket) {
+ websocket.close();
+ setWebSocket(null);
+ }
+ }, [websocket]);
+
+ useEffect(() => {
+ const timeout = setTimeout(() => {
+ console.log(`Connecting (attempt #${connectAttempt+1} of ${MAX_RECONNECT_ATTEMPTS}) to websocket at url: ${wsUrl}`);
+ connect();
+ }, Math.min(1000 * Math.pow(2, connectAttempt), 30000)); // exponential backoff
+
+ return () => {
+ clearTimeout(timeout);
+ };
+ }, [connect]);
+
+ return {isConnected, messages, connect, disconnect};
+};
diff --git a/freemocap-ui/src/hooks/useWebsocket.ts b/freemocap-ui/src/hooks/useWebsocket.ts
deleted file mode 100644
index 5ba76a4f..00000000
--- a/freemocap-ui/src/hooks/useWebsocket.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useEffect, useState } from 'react';
-
-export const useWebSocket = (url: string) => {
- const [isConnected, setIsConnected] = useState(false);
- const [messages, setMessages] = useState<string[]>([]);
- const [socket, setSocket] = useState<WebSocket | null>(null);
-
- useEffect(() => {
- let attempt = 0;
-
- const connect = () => {
- const ws = new WebSocket(url);
-
- ws.onopen = () => {
- setIsConnected(true);
- attempt = 0;
- console.log('WebSocket is connected');
- };
-
- ws.onclose = () => {
- setIsConnected(false);
- console.log(`WebSocket is closed, attempting to reconnect (attempt ${attempt + 1})`);
- setTimeout(() => {
- attempt++;
- connect();
- }, Math.min(1000 * Math.pow(2, attempt), 30000)); // Exponential backoff
- };
-
- ws.onmessage = (event) => {
- console.log('WebSocket message received with length:', event.data.length);
- setMessages(prevMessages => [...prevMessages, event.data]);
- };
-
- ws.onerror = (error) => {
- console.error('WebSocket error:', error);
- };
-
- setSocket(ws);
- };
-
- connect();
-
- return () => {
- if (socket) {
- socket.close();
- }
- };
- }, [url]);
-
- return { isConnected, messages };
-};
\ No newline at end of file
diff --git a/freemocap-ui/src/layout/Sidebar.tsx b/freemocap-ui/src/layout/Sidebar.tsx
index 339aa3d5..f3c63d72 100644
--- a/freemocap-ui/src/layout/Sidebar.tsx
+++ b/freemocap-ui/src/layout/Sidebar.tsx
@@ -22,6 +22,10 @@ const categories = [
id: 'JS Camera',
route: '/jontestplayground'
},
+ {
+ id: 'Websocket',
+ route: '/websocketConnection'
+ },
// {
// id: "Board Detection",
// route: "/charuco_board_detection"
diff --git a/freemocap-ui/src/layout/routing/router.tsx b/freemocap-ui/src/layout/routing/router.tsx
index 88b0bf10..c43255a9 100644
--- a/freemocap-ui/src/layout/routing/router.tsx
+++ b/freemocap-ui/src/layout/routing/router.tsx
@@ -3,10 +3,9 @@ import {Route, Routes} from "react-router-dom";
import {ConfigView} from "@/views/Config";
import {BrowserCamerasView} from "@/views/BrowserCamerasView";
import {PythonToJsTest} from "@/views/PythonToJsTest";
-import {BoardDetection} from "@/views/BoardDetection";
-import {SkeletonDetection} from "@/views/SkeletonDetection";
import {PythonCamerasView} from "@/views/PythonCamerasView";
import {DefaultView} from "@/views/Default";
+import WebsocketConnection from "@/views/WebsocketConnection";
export const Router = () => {
return (
@@ -16,9 +15,8 @@ export const Router = () => {
<Route path={'/config'} element={<ConfigView/>}/>
<Route path={'/jontestplayground'} element={<BrowserCamerasView/>}/>
<Route path={'/pythonToJs'} element={<PythonToJsTest/>}/>
- {/*<Route path={'/charuco_board_detection'} element={<BoardDetection/>}/>*/}
- {/*<Route path={'/skeleton_detection'} element={<SkeletonDetection/>}/>*/}
<Route path={'/show_cameras'} element={<PythonCamerasView/>}/>
+ <Route path={'/websocketConnection'} element={<WebsocketConnection/>}/>
</Routes>
)
}
diff --git a/freemocap-ui/src/views/PythonCamerasView.tsx b/freemocap-ui/src/views/PythonCamerasView.tsx
index 6773a48b..aa2928b7 100644
--- a/freemocap-ui/src/views/PythonCamerasView.tsx
+++ b/freemocap-ui/src/views/PythonCamerasView.tsx
@@ -1,21 +1,12 @@
import {Box} from "@mui/material";
-import {CaptureType} from "@/services/websocket-connection";
import React from "react";
export const PythonCamerasView = () => {
- // const [websocketConnection, dataUrls] = oldUseWebsocket(CaptureType.ConnectCameras, 8005);
- // if (!dataUrls) {
- // return null;
- // }
return (
<Box sx={{display: "flex", flexDirection: "column"}}>
Hi wowowwwee
<br/>
- {/*websocket status: {websocketConnection.isConnectionClosed ? "closed" : "open"}*/}
- {/*{!websocketConnection.isConnectionClosed && Object.entries(dataUrls).map(([cameraId, url]) => (*/}
- {/* <img key={cameraId} src={url} alt={`video capture from camera ${cameraId}`}/>*/}
- {/*))}*/}
</Box>
);
}
diff --git a/freemocap-ui/src/views/WebsocketConnection.tsx b/freemocap-ui/src/views/WebsocketConnection.tsx
new file mode 100644
index 00000000..2a22ebea
--- /dev/null
+++ b/freemocap-ui/src/views/WebsocketConnection.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import {Box} from '@mui/material';
+import {useWebSocketContext} from '@/context/WebSocketContext';
+
+const WebsocketConnection = () => {
+ const {isConnected, messages} = useWebSocketContext();
+
+ return (
+ <Box sx={{display: 'flex', flexDirection: 'column'}}>
+ Websocket status: {isConnected ? 'connected' : 'disconnected'}
+ </Box>
+ );
+};
+
+export default WebsocketConnection