Merge pull request #7 from truearken/dev

truearken · web-flow · commit bc8283a4627a · 2025-10-27T16:24:09.000+01:00
Dev
diff --git a/TODO.md b/TODO.md
@@ -2,7 +2,7 @@
 
 ### General
 
-- [ ] Updater
+- [x] Updater
 - [x] Make it a Desktop App
 - [x] Settings (eg toggle Auto Select)
 - [ ] Skin Randomizer
@@ -34,4 +34,3 @@
 
 - [x] Apply loadout when agent selection time runs out
 - [x] Wait for VALORANT to start when starting 
-- [ ] Switch to protobuf
diff --git a/frontend/src-tauri/tauri.conf.json b/frontend/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "ValoVault",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "identifier": "me.truearken",
   "build": {
     "frontendDist": "../out",
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
@@ -12,7 +12,7 @@ import Toast from '@/components/Toast';
 import SettingsCard from '@/components/SettingsCard';
 import ConfirmationModal from '@/components/ConfirmationModal';
 import { Preset, LoadoutItemV1 } from '@/lib/types';
-import { getPlayerLoadout, applyLoadout, getPresets, savePresets, getHealth } from '@/services/api';
+import { getPlayerLoadout, applyLoadout, getPresets, savePresets } from '@/services/api';
 import { getSettings, saveSettings } from '@/services/settings';
 import { LocalClientError } from '@/lib/errors';
 import { useData } from '@/context/DataContext';
@@ -26,7 +26,7 @@ const defaultPreset: Preset = {
 };
 
 export default function Home() {
-    const { agents, loading: dataContextLoading } = useData();
+    const { agents, loading: dataContextLoading, isClientHealthy } = useData();
     const [currentLoadout, setCurrentLoadout] = useState<Record<string, LoadoutItemV1>>(defaultPreset.loadout);
     const [presets, setPresets] = useState<Preset[]>([]);
     const [selectedPreset, setSelectedPreset] = useState<Preset | null>(defaultPreset);
@@ -49,6 +49,7 @@ export default function Home() {
 
     const loadData = useCallback(async () => {
         try {
+            setIsLoading(true);
             const [playerLoadout, fetchedPresets, settings] = await Promise.all([
                 getPlayerLoadout(),
                 getPresets(),
@@ -66,7 +67,6 @@ export default function Home() {
             setIsLoading(false);
         } catch (error) {
             if (error instanceof LocalClientError) {
-                setLoadingMessage("Waiting for VALORANT to start...");
                 setIsLoading(true);
             } else {
                 console.error(error);
@@ -78,24 +78,14 @@ export default function Home() {
     }, []);
 
     useEffect(() => {
-        loadData();
-    }, [loadData]);
-
-    useEffect(() => {
-        const healthCheck = async () => {
-            const isHealthy = await getHealth();
-            if (isHealthy && isLoading) {
-                loadData();
-            } else if (!isHealthy && !isLoading) {
-                setIsLoading(true);
-                setLoadingMessage("Waiting for VALORANT to start...");
-            }
-        };
-
-        const intervalId = setInterval(healthCheck, 3000);
-
-        return () => clearInterval(intervalId);
-    }, [isLoading, loadData]);
+        if (isClientHealthy) {
+            setLoadingMessage('Loading application data...');
+            loadData();
+        } else {
+            setIsLoading(true);
+            setLoadingMessage("Waiting for VALORANT to start...");
+        }
+    }, [isClientHealthy, loadData]);
 
     useEffect(() => {
         if (autoSelectAgent !== undefined) {
@@ -254,14 +244,12 @@ export default function Home() {
             if (error instanceof LocalClientError) {
                 setErrorMessage(error.message);
                 setShowErrorModal(true);
-            } else {
-                console.error(error);
             }
+        } finally {
+            setIsEditing(false);
+            setEditingPreset(null);
+            setOriginalPreset(null);
         }
-
-        setIsEditing(false);
-        setEditingPreset(null);
-        setOriginalPreset(null);
     };
 
     const handlePresetDelete = (presetId: string) => {
@@ -315,8 +303,6 @@ export default function Home() {
         setIsNewPresetFromPlus(false);
     };
 
-
-
     const handleCloseErrorModal = () => {
         setShowErrorModal(false);
     };
@@ -368,12 +354,15 @@ export default function Home() {
 
     if (isLoading || dataContextLoading) {
         return (
-            <div className="d-flex flex-column justify-content-center align-items-center vh-100">
-                <div className="spinner-border" role="status">
-                    <span className="visually-hidden">Loading...</span>
+            <>
+                <Header performUpdateAction={handleUpdate} />
+                <div className="d-flex flex-column justify-content-center align-items-center vh-100">
+                    <div className="spinner-border" role="status">
+                        <span className="visually-hidden">Loading...</span>
+                    </div>
+                    <p className="mt-3">{loadingMessage}</p>
                 </div>
-                <p className="mt-3">{loadingMessage}</p>
-            </div>
+            </>
         );
     }
 
@@ -415,7 +404,7 @@ export default function Home() {
                     </div>
                 </div>
             </main>
-            {isEditing && <Footer onSave={handleSave} onCancel={handleCancel} onSaveAsNew={() => handleOpenPresetNameModal(false)} onApply={handleApply} showSaveButton={originalPreset?.uuid !== 'default-preset'} />}
+            {isEditing && <Footer onSave={handleSave} onCancel={handleCancel} onSaveAsNew={() => handleOpenPresetNameModal(false)} onApply={handleApply} showSaveButton={originalPreset?.uuid !== 'default-preset'} />} 
             <PresetNameModal show={showPresetNameModal} onClose={handleClosePresetNameModal} onSave={handleSavePresetName} initialName={renamingPreset?.name} />
             <ErrorModal show={showErrorModal} onClose={handleCloseErrorModal} message={errorMessage} />
             <Toast show={showToast} onClose={() => setShowToast(false)} message={toastMessage} />
@@ -428,4 +417,4 @@ export default function Home() {
             />
         </>
     );
-}
+}
diff --git a/frontend/src/context/DataContext.tsx b/frontend/src/context/DataContext.tsx
@@ -1,8 +1,9 @@
 "use client";
 
-import { createContext, useContext, useState, useEffect, ReactNode } from 'react';
+import { createContext, useContext, useState, useEffect, useCallback, ReactNode } from 'react';
 import { Agent, Weapon, GunBuddy, ContentTier } from '@/lib/types';
-import { getAgents, getWeapons, getGunBuddies, getContentTiers, getOwnedSkins, getOwnedGunBuddies } from '@/services/api';
+import { getAgents, getWeapons, getGunBuddies, getContentTiers, getOwnedSkins, getOwnedGunBuddies, getHealth } from '@/services/api';
+import { LocalClientError } from '@/lib/errors';
 
 interface DataContextType {
     agents: Agent[];
@@ -13,6 +14,7 @@ interface DataContextType {
     ownedChromaIDs: string[];
     ownedBuddyIDs: string[];
     loading: boolean;
+    isClientHealthy: boolean;
 }
 
 const DataContext = createContext<DataContextType | undefined>(undefined);
@@ -26,47 +28,67 @@ export function DataProvider({ children }: { children: ReactNode }) {
     const [ownedChromaIDs, setOwnedChromaIDs] = useState<string[]>([]);
     const [ownedBuddyIDs, setOwnedBuddyIDs] = useState<string[]>([]);
     const [loading, setLoading] = useState(true);
+    const [isClientHealthy, setIsClientHealthy] = useState(false);
 
-    useEffect(() => {
-        async function loadData() {
-            try {
-                setLoading(true);
-                const [agentsData, weaponsData, gunBuddiesData, contentTiersData, ownedSkins, ownedGunBuddies] = await Promise.all([
-                    getAgents(),
-                    getWeapons(),
-                    getGunBuddies(),
-                    getContentTiers(),
-                    getOwnedSkins(),
-                    getOwnedGunBuddies(),
-                ]);
-                setAgents(agentsData);
-                setWeapons(weaponsData);
-                setContentTiers(contentTiersData);
-
-                const levels = ownedSkins.LevelIds;
-                for (const gun of weaponsData) {
-                    const defaultSkin = gun.skins.find(s => s.uuid == gun.defaultSkinUuid)!;
-                    levels.push(defaultSkin.levels[0].uuid)
-                }
-                setOwnedLevelIDs(levels);
-                setOwnedChromaIDs(ownedSkins.ChromaIds);
-                setOwnedBuddyIDs(ownedGunBuddies.LevelIds);
+    const loadData = useCallback(async () => {
+        try {
+            setLoading(true);
+            const [agentsData, weaponsData, gunBuddiesData, contentTiersData, ownedSkins, ownedGunBuddies] = await Promise.all([
+                getAgents(),
+                getWeapons(),
+                getGunBuddies(),
+                getContentTiers(),
+                getOwnedSkins(),
+                getOwnedGunBuddies(),
+            ]);
+            setAgents(agentsData);
+            setWeapons(weaponsData);
+            setContentTiers(contentTiersData);
 
-                const ownedBuddyDetails = gunBuddiesData.filter(b => ownedGunBuddies.LevelIds.includes(b.levels[0].uuid));
-                setOwnedBuddies(ownedBuddyDetails);
+            const levels = ownedSkins.LevelIds;
+            for (const gun of weaponsData) {
+                const defaultSkin = gun.skins.find(s => s.uuid == gun.defaultSkinUuid)!;
+                levels.push(defaultSkin.levels[0].uuid)
+            }
+            setOwnedLevelIDs(levels);
+            setOwnedChromaIDs(ownedSkins.ChromaIds);
+            setOwnedBuddyIDs(ownedGunBuddies.LevelIds);
 
-            } catch (error) {
-                console.error("Failed to load initial data", error);
-            } finally {
+            const ownedBuddyDetails = gunBuddiesData.filter(b => ownedGunBuddies.LevelIds.includes(b.levels[0].uuid));
+            setOwnedBuddies(ownedBuddyDetails);
+            setLoading(false);
+        } catch (error) {
+            if (error instanceof LocalClientError) {
+                setLoading(true);
+            } else {
                 setLoading(false);
             }
         }
-
-        loadData();
     }, []);
 
+    useEffect(() => {
+        const healthCheck = async () => {
+            const isHealthy = await getHealth();
+            setIsClientHealthy(isHealthy);
+            if (isHealthy) {
+                if (loading) {
+                    loadData();
+                }
+            } else {
+                if (!loading) {
+                    setLoading(true);
+                }
+            }
+        };
+
+        healthCheck();
+        const intervalId = setInterval(healthCheck, 3000);
+
+        return () => clearInterval(intervalId);
+    }, [loading, loadData]);
+
     return (
-        <DataContext.Provider value={{ agents, weapons, ownedBuddies, contentTiers, ownedLevelIDs, ownedChromaIDs, ownedBuddyIDs, loading }}>
+        <DataContext.Provider value={{ agents, weapons, ownedBuddies, contentTiers, ownedLevelIDs, ownedChromaIDs, ownedBuddyIDs, loading, isClientHealthy }}>
             {children}
         </DataContext.Provider>
     );
@@ -78,4 +100,4 @@ export function useData() {
         throw new Error('useData must be used within a DataProvider');
     }
     return context;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",`
`3`	`3`	`"productName": "ValoVault",`
`4`		`- "version": "0.2.3",`
	`4`	`+ "version": "0.2.4",`
`5`	`5`	`"identifier": "me.truearken",`
`6`	`6`	`"build": {`
`7`	`7`	`"frontendDist": "../out",`