Merge pull request #9 from truearken/dev

Dev

Author: truearken

TODO.md

@@ -9,10 +9,9 @@
 - [x] Gun Buddy support
 - [x] Version Control in top left
 - [ ] Create "Variants" for Presets so you don't have to change agents for every preset
-- [ ] Tray App
+- [x] Tray App
 - [ ] Autostart Option
-- [ ] Hide unowned agents
-- [ ] Import/Export presets 
+- [x] Hide unowned agents
 
 ### Frontend
 

backend/handlers/handlers.go

@@ -68,6 +68,25 @@ func (h *Handler) GetOwnedGunBuddies(w http.ResponseWriter, r *http.Request) {
 	h.returnAny(w, &OwnedGunBuddiesResponse{LevelIds: buddies})
 }
 
+type OwnedAgentsResponse struct {
+	AgentIds []string
+}
+
+func (h *Handler) GetOwnedAgents(w http.ResponseWriter, r *http.Request) {
+	ownedAgents, err := h.Val.GetOwnedItems(valclient.ITEM_TYPE_AGENTS)
+	if err != nil {
+		h.returnError(w, err)
+		return
+	}
+
+	agents := make([]string, 0, len(ownedAgents.Entitlements))
+	for _, b := range ownedAgents.Entitlements {
+		agents = append(agents, b.ItemID)
+	}
+
+	h.returnAny(w, &OwnedAgentsResponse{AgentIds: agents})
+}
+
 func (h *Handler) GetPlayerLoadout(w http.ResponseWriter, r *http.Request) {
 	loadout, err := h.Val.GetPlayerLoadout()
 	if err != nil {

backend/main.go

@@ -4,15 +4,20 @@ import (
 	"backend/handlers"
 	"backend/settings"
 	"backend/tick"
+	"log"
 	"log/slog"
 	"net/http"
+	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/truearken/valclient/valclient"
 )
 
 func main() {
+	initLogger()
+
 	var val *valclient.ValClient
 	var err error
 	slog.Info("waiting for valorant to start")
@@ -27,7 +32,7 @@ func main() {
 
 	settings, err := settings.Get()
 	if err != nil {
-		panic(err)
+		log.Fatalf("unable to get settings: %v", err)
 	}
 	slog.Info("found settings", "settings", settings)
 
@@ -41,6 +46,7 @@ func main() {
 	mux.HandleFunc("POST /v1/presets", h.PostPresets)
 	mux.HandleFunc("GET /v1/owned-skins", h.GetOwnedSkins)
 	mux.HandleFunc("GET /v1/owned-gun-buddies", h.GetOwnedGunBuddies)
+	mux.HandleFunc("GET /v1/owned-agents", h.GetOwnedAgents)
 	mux.HandleFunc("GET /v1/player-loadout", h.GetPlayerLoadout)
 	mux.HandleFunc("POST /v1/apply-loadout", h.PostApplyLoadout)
 	mux.HandleFunc("GET /v1/settings", h.GetSettings)
@@ -55,6 +61,26 @@ func main() {
 	}
 }
 
+func initLogger() {
+	configDir, err := os.UserConfigDir()
+	if err != nil {
+		log.Fatalf("unable to get config dir: %v", err)
+	}
+
+	logDir := filepath.Join(configDir, "valovault/logs")
+
+	if err := os.MkdirAll(logDir, 0755); err != nil {
+		log.Fatalf("error opening file: %v", err)
+	}
+
+	f, err := os.OpenFile(filepath.Join(logDir, time.Now().Format("2006-01-02")+".log"), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		log.Fatalf("error opening file: %v", err)
+	}
+
+	log.SetOutput(f)
+}
+
 func logMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if !strings.Contains(r.URL.String(), "/health") {

backend/tick/tick.go

@@ -20,9 +20,23 @@ func NewTicker(val *valclient.ValClient) *Ticker {
 	return &Ticker{Val: val}
 }
 
+func (t *Ticker) Refresh() {
+	refreshTicker := time.NewTicker(time.Minute * 1)
+	for range refreshTicker.C {
+		newVal, err := valclient.NewClient()
+		if err != nil {
+			slog.Warn("unable to refresh client", "err", err)
+			continue
+		}
+		t.Val = newVal
+		slog.Info("client refreshed succesfully")
+	}
+}
+
 func (t *Ticker) Start() {
 	ticker := time.NewTicker(TICK_SPEED_SECONDS * time.Second * 3)
-	defer ticker.Stop()
+
+	go t.Refresh()
 
 	lastAgentUuid := ""
 	for range ticker.C {

frontend/src-tauri/Cargo.toml

@@ -21,7 +21,7 @@ tauri-build = { version = "2.4.1", features = [] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.8.5", features = [] }
+tauri = { version = "2.8.5", features = ["tray-icon"] }
 tauri-plugin-log = "2"
 tauri-plugin-http = "2"
 tauri-plugin-shell = "2"

frontend/src-tauri/src/lib.rs

@@ -1,5 +1,9 @@
 use std::sync::Mutex;
-use tauri::{Manager, RunEvent, State};
+use tauri::{
+    menu::{Menu, MenuItem},
+    tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
+    Manager, RunEvent, State, WindowEvent,
+};
 use tauri_plugin_shell::process::CommandChild;
 use tauri_plugin_shell::ShellExt;
 
@@ -32,6 +36,36 @@ pub fn run() {
                 *state.child.lock().unwrap() = Some(child);
             }
 
+            let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
+            let menu = Menu::with_items(app, &[&quit_i])?;
+
+            let _tray = TrayIconBuilder::new()
+                .icon(app.default_window_icon().unwrap().clone())
+                .menu(&menu)
+                .show_menu_on_left_click(false)
+                .on_menu_event(|app, event| match event.id.as_ref() {
+                    "quit" => {
+                        app.exit(0);
+                    }
+                    _ => {}
+                })
+                .on_tray_icon_event(|tray, event| match event {
+                    TrayIconEvent::Click {
+                        button: MouseButton::Left,
+                        button_state: MouseButtonState::Up,
+                        ..
+                    } => {
+                        let app = tray.app_handle();
+                        if let Some(window) = app.get_webview_window("main") {
+                            let _ = window.unminimize();
+                            let _ = window.show();
+                            let _ = window.set_focus();
+                        }
+                    }
+                    _ => {}
+                })
+                .build(app)?;
+
             Ok(())
         });
 
@@ -41,12 +75,24 @@ pub fn run() {
 
     app.run(|app_handle, event| {
         if !cfg!(dev) {
-            if let RunEvent::ExitRequested { .. } = event {
+            if let RunEvent::ExitRequested { .. } = &event {
                 let state: State<AppState> = app_handle.state();
                 if let Some(child) = state.child.lock().unwrap().take() {
                     child.kill().expect("Failed to kill sidecar");
                 };
             }
         }
+
+        if let RunEvent::WindowEvent {
+            event: WindowEvent::Resized(_),
+            ..
+        } = &event
+        {
+            if let Some(window) = app_handle.get_webview_window("main") {
+                if let Ok(true) = window.is_minimized() {
+                    let _ = window.hide();
+                }
+            }
+        }
     });
 }

frontend/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "ValoVault",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "identifier": "me.truearken",
   "build": {
     "frontendDist": "../out",

frontend/src/context/DataContext.tsx

@@ -2,7 +2,7 @@
 
 import { createContext, useContext, useState, useEffect, useCallback, ReactNode } from 'react';
 import { Agent, Weapon, GunBuddy, ContentTier } from '@/lib/types';
-import { getAgents, getWeapons, getGunBuddies, getContentTiers, getOwnedSkins, getOwnedGunBuddies, getHealth } from '@/services/api';
+import { getAgents, getWeapons, getGunBuddies, getContentTiers, getOwnedSkins, getOwnedGunBuddies, getHealth, getOwnedAgents } from '@/services/api';
 import { LocalClientError } from '@/lib/errors';
 
 interface DataContextType {
@@ -33,15 +33,19 @@ export function DataProvider({ children }: { children: ReactNode }) {
     const loadData = useCallback(async () => {
         try {
             setLoading(true);
-            const [agentsData, weaponsData, gunBuddiesData, contentTiersData, ownedSkins, ownedGunBuddies] = await Promise.all([
+            const [agentsData, weaponsData, gunBuddiesData, contentTiersData, ownedSkins, ownedGunBuddies, ownedAgents] = await Promise.all([
                 getAgents(),
                 getWeapons(),
                 getGunBuddies(),
                 getContentTiers(),
                 getOwnedSkins(),
                 getOwnedGunBuddies(),
+                getOwnedAgents(),
             ]);
-            setAgents(agentsData);
+
+            const ownedAgentDetails = agentsData.filter(a => ownedAgents.AgentIds.includes(a.uuid))
+            setAgents(ownedAgentDetails);
+
             setWeapons(weaponsData);
             setContentTiers(contentTiersData);
 
@@ -100,4 +104,4 @@ export function useData() {
         throw new Error('useData must be used within a DataProvider');
     }
     return context;
-}
+}

frontend/src/lib/types.ts

@@ -72,6 +72,10 @@ export interface OwnedGunBuddiesResponse {
     LevelIds: string[];
 }
 
+export interface OwnedAgentsResponse {
+    AgentIds: string[];
+}
+
 export interface ContentTier {
     uuid: string;
     displayName: string;

frontend/src/services/api.ts

@@ -1,7 +1,6 @@
-import { Weapon, Agent, OwnedSkinsResponse, LoadoutItemV1, Preset, GunBuddy, ContentTier } from '@/lib/types';
+import { Weapon, Agent, OwnedSkinsResponse, LoadoutItemV1, Preset, GunBuddy, ContentTier, OwnedGunBuddiesResponse, OwnedAgentsResponse  } from '@/lib/types';
 import { LocalClientError } from '@/lib/errors';
 import { fetch } from '@tauri-apps/plugin-http';
-import { OwnedGunBuddiesResponse } from '../lib/types';
 
 export const LOCAL_URL = "http://localhost:31719/v1"
 
@@ -111,6 +110,19 @@ export async function getOwnedGunBuddies(): Promise<OwnedGunBuddiesResponse> {
     }
 }
 
+export async function getOwnedAgents(): Promise<OwnedAgentsResponse> {
+    try {
+        const response = await fetch(LOCAL_URL+'/owned-agents');
+        if (!response.ok) {
+            throw new Error('Failed to fetch owned agents. The local client might not be running or there was a server error.');
+        }
+        return await response.json();
+    } catch (error) {
+        console.error(error);
+        throw new LocalClientError();
+    }
+}
+
 export async function getPresets(): Promise<Preset[]> {
     try {
         const response = await fetch(LOCAL_URL+'/presets');