Skip to content

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

TypeScript

ws connected!

jonmatthis96bccb05c8fe
diff --git a/.gitignore b/.gitignore
index feeab654..f3174dc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,4 +156,5 @@ desktop.ini
node_modules/
freemocap/system/gui_state.json
.nuxt
-/tauri-nuxt-vue/.idea/
\ No newline at end of file
+/tauri-nuxt-vue/.idea/
+realease/*
\ No newline at end of file
diff --git a/freemocap-ui/index.html b/freemocap-ui/index.html
index aeae7ef3..8ab2b712 100644
--- a/freemocap-ui/index.html
+++ b/freemocap-ui/index.html
@@ -5,7 +5,7 @@
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
- <title>Electron + Vite + React</title>
+ <title>Electron + Vite + React - wowee</title>
</head>
<body>
<div id="root"></div>
diff --git a/freemocap-ui/src/App.tsx b/freemocap-ui/src/App.tsx
index 79a1edcf..5b30994d 100644
--- a/freemocap-ui/src/App.tsx
+++ b/freemocap-ui/src/App.tsx
@@ -1,12 +1,26 @@
import React from 'react';
import {Paperbase} from "@/layout/paperbase_theme.tsx/Paperbase";
+import {useWebSocket} from '@/hooks/useWebsocket';
function App() {
- return (
- <React.Fragment>
- <Paperbase />
- </React.Fragment>
- );
+ const _port = 8005;
+ const wsURL = `ws://localhost:${_port}/skellycam/websocket/connect`;
+ const {isConnected, messages} = useWebSocket(wsURL);
+ 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>
+ );
}
export default App;
diff --git a/freemocap-ui/src/hooks/use-websocket.tsx b/freemocap-ui/src/hooks/old-use-websocket.tsx
similarity index 80%
rename from freemocap-ui/src/hooks/use-websocket.tsx
rename to freemocap-ui/src/hooks/old-use-websocket.tsx
index 32c41c8b..7709f6e2 100644
--- a/freemocap-ui/src/hooks/use-websocket.tsx
+++ b/freemocap-ui/src/hooks/old-use-websocket.tsx
@@ -1,9 +1,9 @@
import {useEffect, useState} from "react";
import {CaptureType, WebsocketConnection, OnMessageHandler} from "@/services/websocket-connection";
-export const useWebsocket = (captureType: CaptureType,
- port: number,
- onMessage?: OnMessageHandler): [WebsocketConnection, { [key: string]: string }] => {
+export const oldUseWebsocket = (captureType: CaptureType,
+ port: number,
+ onMessage?: OnMessageHandler): [WebsocketConnection, { [key: string]: string }] => {
const [webcam_id] = useState<string>("0");
const [websocketConnection,] = useState(() => new WebsocketConnection(captureType, port));
diff --git a/freemocap-ui/src/hooks/useWebsocket.ts b/freemocap-ui/src/hooks/useWebsocket.ts
new file mode 100644
index 00000000..5ba76a4f
--- /dev/null
+++ b/freemocap-ui/src/hooks/useWebsocket.ts
@@ -0,0 +1,51 @@
+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/views/BoardDetection.tsx b/freemocap-ui/src/views/BoardDetection.tsx
index 98d935d0..a1ba4898 100644
--- a/freemocap-ui/src/views/BoardDetection.tsx
+++ b/freemocap-ui/src/views/BoardDetection.tsx
@@ -1,7 +1,7 @@
import React from "react";
import {Box} from "@mui/material";
import {CaptureType} from "../services/websocket-connection";
-import {useWebsocket} from "../hooks/use-websocket";
+import {oldUseWebsocket} from "../hooks/old-use-websocket";
export const BoardDetection = () => {
// const [frameCapture, data] = useWebsocket(CaptureType.BoardDetection, 8080);
diff --git a/freemocap-ui/src/views/PythonCamerasView.tsx b/freemocap-ui/src/views/PythonCamerasView.tsx
index 1d28ccad..6773a48b 100644
--- a/freemocap-ui/src/views/PythonCamerasView.tsx
+++ b/freemocap-ui/src/views/PythonCamerasView.tsx
@@ -1,22 +1,21 @@
import {Box} from "@mui/material";
-import {useWebsocket} from "@/hooks/use-websocket";
import {CaptureType} from "@/services/websocket-connection";
import React from "react";
export const PythonCamerasView = () => {
- const [websocketConnection, dataUrls] = useWebsocket(CaptureType.ConnectCameras, 8005);
- if (!dataUrls) {
- return null;
- }
+ // 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}`}/>
- ))}
+ {/*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/SkeletonDetection.tsx b/freemocap-ui/src/views/SkeletonDetection.tsx
index cd5e13bb..60828289 100644
--- a/freemocap-ui/src/views/SkeletonDetection.tsx
+++ b/freemocap-ui/src/views/SkeletonDetection.tsx
@@ -1,7 +1,7 @@
import React from "react";
import {Box} from "@mui/material";
import {CaptureType} from "../services/websocket-connection";
-import {useWebsocket} from "../hooks/use-websocket";
+import {oldUseWebsocket} from "../hooks/old-use-websocket";
export const SkeletonDetection = () => {
// const [frameCapture, data] = useWebsocket(CaptureType.SkeletonDetection, 8080,);
diff --git a/pyproject.toml b/pyproject.toml
index 20628660..5654f091 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ skellycam = { git = "https://github.com/freemocap/skellycam", branch = "jon/deve
skellytracker = { git = "https://github.com/freemocap/skellytracker", branch = "jon/development" }
skellyforge = { git = "https://github.com/freemocap/skellyforge" }
skelly-viewer = { git = "https://github.com/freemocap/skellyviewer" }
-freemocap-blender-addon = { git = "https://github.com/freemocap/freemocap_blender_addon" }
+freemocap-blender-addon = { git = "https://github.com/freemocap/freemocap_blender_addon"}#, branch = "jon/development" }
skelly-synchronize = { git = "https://github.com/freemocap/skelly_synchronize" }
[project.scripts]