Merge branch 'develop' into feature/dashboardPage
This commit is contained in:
@@ -20,7 +20,8 @@
|
|||||||
"@tanstack/react-router-devtools": "^1.136.18",
|
"@tanstack/react-router-devtools": "^1.136.18",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0"
|
"react-dom": "^19.2.0",
|
||||||
|
"react-use-websocket": "3.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.39.1",
|
"@eslint/js": "^9.39.1",
|
||||||
|
|||||||
23
src/app/context/WebSocketContext.ts
Normal file
23
src/app/context/WebSocketContext.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { createContext, useContext } from "react";
|
||||||
|
import { ReadyState } from "react-use-websocket";
|
||||||
|
import type { InfoBarData } from "../../types/types";
|
||||||
|
|
||||||
|
type InfoSocketState = {
|
||||||
|
data: InfoBarData | null;
|
||||||
|
readyState: ReadyState;
|
||||||
|
sendJson: (msg: unknown) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type WebSocketConextValue = {
|
||||||
|
info: InfoSocketState;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WebsocketContext = createContext<WebSocketConextValue | null>(null);
|
||||||
|
|
||||||
|
const useWebSocketContext = () => {
|
||||||
|
const ctx = useContext(WebsocketContext);
|
||||||
|
if (!ctx) throw new Error("useWebSocketContext must be used inside <WebSocketConext.Provider>");
|
||||||
|
return ctx;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useInfoSocket = () => useWebSocketContext().info;
|
||||||
@@ -1,7 +1,11 @@
|
|||||||
import { QueryClientProvider } from "@tanstack/react-query";
|
|
||||||
import { queryClient } from "../config/queryClient";
|
|
||||||
import type { PropsWithChildren } from "react";
|
import type { PropsWithChildren } from "react";
|
||||||
|
import { QueryProvider } from "./QueryProviders";
|
||||||
|
import { WebSocketProvider } from "./WebSocketProvider";
|
||||||
|
|
||||||
export const AppProviders = ({ children }: PropsWithChildren) => {
|
export const AppProviders = ({ children }: PropsWithChildren) => {
|
||||||
return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;
|
return (
|
||||||
|
<QueryProvider>
|
||||||
|
<WebSocketProvider>{children}</WebSocketProvider>
|
||||||
|
</QueryProvider>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
38
src/app/providers/WebSocketProvider.tsx
Normal file
38
src/app/providers/WebSocketProvider.tsx
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import { useEffect, useMemo, useState, type ReactNode } from "react";
|
||||||
|
import { WebsocketContext, type WebSocketConextValue } from "../context/WebSocketContext";
|
||||||
|
import useWebSocket from "react-use-websocket";
|
||||||
|
import { wsConfig } from "../config/wsconfig";
|
||||||
|
import type { InfoBarData } from "../../types/types";
|
||||||
|
|
||||||
|
type WebSocketProviderProps = {
|
||||||
|
children: ReactNode;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
|
||||||
|
const [systemData, setSystemData] = useState<InfoBarData | null>(null);
|
||||||
|
const infoSocket = useWebSocket(wsConfig.infoBar, { share: true, shouldReconnect: () => true });
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
async function parseData() {
|
||||||
|
if (infoSocket.lastMessage) {
|
||||||
|
const text = await infoSocket.lastMessage.data.text();
|
||||||
|
const data = JSON.parse(text);
|
||||||
|
setSystemData(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
parseData();
|
||||||
|
}, [infoSocket.lastMessage]);
|
||||||
|
|
||||||
|
const value = useMemo<WebSocketConextValue>(
|
||||||
|
() => ({
|
||||||
|
info: {
|
||||||
|
data: systemData,
|
||||||
|
readyState: infoSocket.readyState,
|
||||||
|
sendJson: infoSocket.sendJsonMessage,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
[infoSocket.readyState, infoSocket.sendJsonMessage, systemData],
|
||||||
|
);
|
||||||
|
|
||||||
|
return <WebsocketContext.Provider value={value}>{children}</WebsocketContext.Provider>;
|
||||||
|
};
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import { useInfoSocket } from "../../../hooks/useInfoWebSocket";
|
import { useInfoSocket } from "../../../app/context/WebSocketContext";
|
||||||
import Card from "../../../ui/Card";
|
import Card from "../../../ui/Card";
|
||||||
import CardHeader from "../../../ui/CardHeader";
|
import CardHeader from "../../../ui/CardHeader";
|
||||||
|
|
||||||
const SystemStatusCard = () => {
|
const SystemStatusCard = () => {
|
||||||
const { stats } = useInfoSocket();
|
const { data: stats } = useInfoSocket();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="p-4 w-[40%]">
|
<Card className="p-4 w-[40%]">
|
||||||
|
|||||||
@@ -2049,6 +2049,11 @@ react-refresh@^0.18.0:
|
|||||||
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.18.0.tgz#2dce97f4fe932a4d8142fa1630e475c1729c8062"
|
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.18.0.tgz#2dce97f4fe932a4d8142fa1630e475c1729c8062"
|
||||||
integrity sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==
|
integrity sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==
|
||||||
|
|
||||||
|
react-use-websocket@3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/react-use-websocket/-/react-use-websocket-3.0.0.tgz#754cb8eea76f55d31c5676d4abe3e573bc2cea04"
|
||||||
|
integrity sha512-BInlbhXYrODBPKIplDAmI0J1VPM+1KhCLN09o+dzgQ8qMyrYs4t5kEYmCrTqyRuMTmpahylHFZWQXpfYyDkqOw==
|
||||||
|
|
||||||
react@^19.2.0:
|
react@^19.2.0:
|
||||||
version "19.2.0"
|
version "19.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/react/-/react-19.2.0.tgz#d33dd1721698f4376ae57a54098cb47fc75d93a5"
|
resolved "https://registry.yarnpkg.com/react/-/react-19.2.0.tgz#d33dd1721698f4376ae57a54098cb47fc75d93a5"
|
||||||
|
|||||||
Reference in New Issue
Block a user