From f441908bf1da22e0e7ff44ef5226fba36ac46972 Mon Sep 17 00:00:00 2001 From: loucass003 Date: Mon, 12 Oct 2026 15:39:26 +0200 Subject: [PATCH] Fix race on prerequisites --- gui/app/src/hooks/app.ts | 3 ++ gui/app/src/hooks/body-part-prerequisites.ts | 36 ++++++++------------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/gui/app/src/hooks/app.ts b/gui/app/src/hooks/app.ts index 82be72c28..d69945087 100644 --- a/gui/app/src/hooks/app.ts +++ b/gui/app/src/hooks/app.ts @@ -20,6 +20,7 @@ import { resetStatusAtom, } from '@/store/app-store'; import { fetchCurrentFirmwareRelease, FirmwareRelease } from './firmware-update'; +import { useProvideBodyPartPrerequisites } from './body-part-prerequisites'; import { DEFAULT_LOCALE, LangContext } from '@/i18n/config'; export interface AppContext { @@ -80,6 +81,8 @@ export function useProvideAppContext(): AppContext { sendRPCPacket(RpcMessage.ResetsSettingsRequest, new ResetsSettingsRequestT()); }, [isConnected]); + useProvideBodyPartPrerequisites(); + useEffect(() => { if (!config) return; diff --git a/gui/app/src/hooks/body-part-prerequisites.ts b/gui/app/src/hooks/body-part-prerequisites.ts index 677cd0745..6be9022a5 100644 --- a/gui/app/src/hooks/body-part-prerequisites.ts +++ b/gui/app/src/hooks/body-part-prerequisites.ts @@ -11,28 +11,10 @@ import { useWebsocketAPI } from './websocket-api'; export type BodyPartPrerequisites = Partial>; const bodyPartPrerequisitesAtom = atom({}); -const requestedAtom = atom(false); -export function useBodyPartPrerequisites() { - const { sendRPCPacket, useRPCPacket, isConnected } = useWebsocketAPI(); - const prerequisites = useAtomValue(bodyPartPrerequisitesAtom); +export function useProvideBodyPartPrerequisites() { + const { useRPCPacket } = useWebsocketAPI(); const setPrerequisites = useSetAtom(bodyPartPrerequisitesAtom); - const requested = useAtomValue(requestedAtom); - const setRequested = useSetAtom(requestedAtom); - - useEffect(() => { - if (!isConnected) { - setRequested(false); - return; - } - if (requested) return; - - setRequested(true); - sendRPCPacket( - RpcMessage.BodyPartPrerequisitesRequest, - new BodyPartPrerequisitesRequestT() - ); - }, [isConnected, requested]); useRPCPacket( RpcMessage.BodyPartPrerequisitesResponse, @@ -46,8 +28,20 @@ export function useBodyPartPrerequisites() { ) ) ); +} - return prerequisites; +export function useBodyPartPrerequisites() { + const { sendRPCPacket, isConnected } = useWebsocketAPI(); + + useEffect(() => { + if (!isConnected) return; + sendRPCPacket( + RpcMessage.BodyPartPrerequisitesRequest, + new BodyPartPrerequisitesRequestT() + ); + }, [isConnected]); + + return useAtomValue(bodyPartPrerequisitesAtom); } export function unmetRequirements(