From 13da1c8340f29aa2a10bd110e9d16df1e196194a Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Sat, 9 Aug 2025 19:30:51 +0200 Subject: [PATCH] feat(app): implement character login and destination setting for multiple characters This commit introduces several key features: - **Multiple Character Support**: The application can now handle multiple logged-in EVE Online characters. - **List Characters**: A new function `ListCharacters` allows retrieving a list of all authenticated characters. - **Set Destination for All**: The `SetDestinationForAll` function enables setting a destination for all logged-in characters simultaneously. - **UI Updates**: The frontend has been updated to display logged-in characters and to allow setting destinations for all characters. - **Backend Refinements**: The ESI SSO logic has been improved to support refreshing tokens for multiple characters and to handle the new multi-character functionality. - **Dependency Updates**: Dependencies have been updated to their latest versions. chore: update go module dependencies --- app.go | 28 ++ esi_sso.go | 377 ++++++++++-------- frontend/src/components/Header.tsx | 33 +- frontend/src/components/SystemContextMenu.tsx | 31 +- frontend/wailsjs/go/main/App.d.ts | 5 + frontend/wailsjs/go/main/App.js | 8 + frontend/wailsjs/go/models.ts | 19 + go.mod | 40 +- go.sum | 99 ++--- 9 files changed, 378 insertions(+), 262 deletions(-) create mode 100644 frontend/wailsjs/go/models.ts diff --git a/app.go b/app.go index a25748d..7f65d2f 100644 --- a/app.go +++ b/app.go @@ -97,3 +97,31 @@ func (a *App) SetDestinationByName(systemName string, clearOthers bool, addToBeg } return a.ssi.PostWaypoint(id, clearOthers, addToBeginning) } + +// SetDestinationForAll resolves system name to ID and applies waypoint to all logged-in characters +func (a *App) SetDestinationForAll(systemName string, clearOthers bool, addToBeginning bool) error { + if a.ssi == nil { + return errors.New("ESI not initialised") + } + id, err := a.ssi.ResolveSystemIDByName(a.ctx, systemName) + if err != nil { + return err + } + return a.ssi.PostWaypointForAll(id, clearOthers, addToBeginning) +} + +// ListCharacters returns all characters stored in the token DB +func (a *App) ListCharacters() ([]CharacterInfo, error) { + if a.ssi == nil || a.ssi.db == nil { + return nil, errors.New("ESI not initialised") + } + var tokens []ESIToken + if err := a.ssi.db.Find(&tokens).Error; err != nil { + return nil, err + } + list := make([]CharacterInfo, 0, len(tokens)) + for _, t := range tokens { + list = append(list, CharacterInfo{CharacterID: t.CharacterID, CharacterName: t.CharacterName}) + } + return list, nil +} diff --git a/esi_sso.go b/esi_sso.go index 8315332..cc27366 100644 --- a/esi_sso.go +++ b/esi_sso.go @@ -24,22 +24,18 @@ import ( ) const ( - // SSO endpoints issuerAuthorizeURL = "https://login.eveonline.com/v2/oauth/authorize" issuerTokenURL = "https://login.eveonline.com/v2/oauth/token" - - // ESI base - esiBase = "https://esi.evetech.net" + esiBase = "https://esi.evetech.net" ) -// ESISSO encapsulates a minimal PKCE SSO client and token store type ESISSO struct { clientID string redirectURI string scopes []string - state string - codeVerifier string + state string + codeVerifier string codeChallenge string mu sync.Mutex @@ -74,6 +70,11 @@ type ESIToken struct { CreatedAt time.Time } +type CharacterInfo struct { + CharacterID int64 `json:"character_id"` + CharacterName string `json:"character_name"` +} + func NewESISSO(clientID string, redirectURI string, scopes []string) *ESISSO { s := &ESISSO{ clientID: clientID, @@ -94,7 +95,6 @@ func (s *ESISSO) initDB() error { if err != nil { return err } - // Ensure tokens table exists in same DB; safe to AutoMigrate if err := db.AutoMigrate(&ESIToken{}); err != nil { return err } @@ -128,7 +128,6 @@ func (s *ESISSO) loadToken() { } } -// BuildAuthorizeURL prepares state and PKCE challenge and returns the browser URL func (s *ESISSO) BuildAuthorizeURL() (string, error) { if s.clientID == "" { return "", errors.New("EVE_SSO_CLIENT_ID not set") @@ -155,7 +154,6 @@ func (s *ESISSO) BuildAuthorizeURL() (string, error) { return issuerAuthorizeURL + "?" + q.Encode(), nil } -// StartCallbackServerAsync starts the callback server in the background and returns immediately func (s *ESISSO) StartCallbackServerAsync() error { u, err := url.Parse(s.redirectURI) if err != nil { @@ -209,7 +207,6 @@ func (s *ESISSO) StartCallbackServerAsync() error { return nil } -// Deprecated: blocking start; prefer StartCallbackServerAsync func (s *ESISSO) StartCallbackServer() error { u, err := url.Parse(s.redirectURI) if err != nil { @@ -290,7 +287,6 @@ func (s *ESISSO) exchangeToken(ctx context.Context, code string) error { } s.mu.Lock() - defer s.mu.Unlock() if tr.AccessToken != "" { s.accessToken = tr.AccessToken } @@ -300,7 +296,7 @@ func (s *ESISSO) exchangeToken(ctx context.Context, code string) error { if tr.ExpiresIn > 0 { s.expiresAt = time.Now().Add(time.Duration(tr.ExpiresIn-30) * time.Second) } - // Parse basic claims for display + s.mu.Unlock() name, cid := parseTokenCharacter(tr.AccessToken) s.characterName = name s.characterID = cid @@ -340,7 +336,6 @@ func (s *ESISSO) refresh(ctx context.Context) error { } s.mu.Lock() - defer s.mu.Unlock() s.accessToken = tr.AccessToken if tr.RefreshToken != "" { s.refreshToken = tr.RefreshToken @@ -348,6 +343,7 @@ func (s *ESISSO) refresh(ctx context.Context) error { if tr.ExpiresIn > 0 { s.expiresAt = time.Now().Add(time.Duration(tr.ExpiresIn-30) * time.Second) } + s.mu.Unlock() name, cid := parseTokenCharacter(tr.AccessToken) s.characterName = name s.characterID = cid @@ -355,8 +351,50 @@ func (s *ESISSO) refresh(ctx context.Context) error { return nil } +func (s *ESISSO) refreshForToken(ctx context.Context, t *ESIToken) (*ESIToken, error) { + form := url.Values{} + form.Set("grant_type", "refresh_token") + form.Set("refresh_token", t.RefreshToken) + form.Set("client_id", s.clientID) + + req, err := http.NewRequestWithContext(ctx, http.MethodPost, issuerTokenURL, strings.NewReader(form.Encode())) + if err != nil { + return nil, err + } + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + resp, err := http.DefaultClient.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode < 200 || resp.StatusCode >= 300 { + b, _ := io.ReadAll(resp.Body) + return nil, fmt.Errorf("token refresh failed: %s: %s", resp.Status, string(b)) + } + var tr tokenResponse + if err := json.NewDecoder(resp.Body).Decode(&tr); err != nil { + return nil, err + } + t.AccessToken = tr.AccessToken + if tr.RefreshToken != "" { + t.RefreshToken = tr.RefreshToken + } + if tr.ExpiresIn > 0 { + t.ExpiresAt = time.Now().Add(time.Duration(tr.ExpiresIn-30) * time.Second) + } + if s.db != nil { + _ = s.db.Save(t).Error + } + return t, nil +} + func (s *ESISSO) ensureAccessToken(ctx context.Context) (string, error) { s.mu.Lock() + if s.accessToken == "" && s.db != nil && s.characterID != 0 { + s.mu.Unlock() + s.loadToken() + s.mu.Lock() + } tok := s.accessToken exp := s.expiresAt s.mu.Unlock() @@ -374,12 +412,26 @@ func (s *ESISSO) ensureAccessToken(ctx context.Context) (string, error) { return tok, nil } -// PostWaypoint calls ESI to set destination or add waypoint +func (s *ESISSO) ensureAccessTokenFor(ctx context.Context, t *ESIToken) (string, error) { + if t.AccessToken == "" || time.Now().After(t.ExpiresAt.Add(-60*time.Second)) { + nt, err := s.refreshForToken(ctx, t) + if err != nil { + return "", err + } + return nt.AccessToken, nil + } + return t.AccessToken, nil +} + func (s *ESISSO) PostWaypoint(destinationID int64, clearOthers bool, addToBeginning bool) error { tok, err := s.ensureAccessToken(context.Background()) if err != nil { return err } + return s.postWaypointWithToken(tok, destinationID, clearOthers, addToBeginning) +} + +func (s *ESISSO) postWaypointWithToken(tok string, destinationID int64, clearOthers bool, addToBeginning bool) error { q := url.Values{} q.Set("destination_id", strconv.FormatInt(destinationID, 10)) q.Set("add_to_beginning", strconv.FormatBool(addToBeginning)) @@ -410,12 +462,30 @@ func (s *ESISSO) PostWaypoint(destinationID int64, clearOthers bool, addToBeginn return fmt.Errorf("waypoint failed: %s: %s", resp.Status, string(b)) } -// Status reports current login state and character details -type SSOStatus struct { - LoggedIn bool - CharacterID int64 - CharacterName string - ExpiresAt time.Time +func (s *ESISSO) PostWaypointForAll(destinationID int64, clearOthers bool, addToBeginning bool) error { + if s.db == nil { + return errors.New("db not initialised") + } + var tokens []ESIToken + if err := s.db.Find(&tokens).Error; err != nil { + return err + } + var firstErr error + for i := range tokens { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + tok, err := s.ensureAccessTokenFor(ctx, &tokens[i]) + cancel() + if err != nil { + if firstErr == nil { + firstErr = err + } + continue + } + if err := s.postWaypointWithToken(tok, destinationID, clearOthers, addToBeginning); err != nil && firstErr == nil { + firstErr = err + } + } + return firstErr } func (s *ESISSO) Status() SSOStatus { @@ -429,151 +499,13 @@ func (s *ESISSO) Status() SSOStatus { } } -// ResolveSystemIDByName first checks local DB via GORM, then falls back to ESI -func (s *ESISSO) ResolveSystemIDByName(ctx context.Context, name string) (int64, error) { - name = strings.TrimSpace(name) - if name == "" { - return 0, errors.New("empty system name") - } - // 0) Try DB first - if s.db != nil { - var sys SolarSystem - if err := s.db.Where("solarSystemName = ?", name).First(&sys).Error; err == nil && sys.SolarSystemID != 0 { - fmt.Printf("DB: resolved %q -> %d\n", name, sys.SolarSystemID) - return sys.SolarSystemID, nil - } - } - // Fallback to ESI logic - // 1) Prefer universe/ids (name->id) for accuracy - type idsReq struct { - Names []string `json:"names"` - } - body, _ := json.Marshal(idsReq{Names: []string{name}}) - idsURL := esiBase + "/v3/universe/ids/?datasource=tranquility" - fmt.Printf("ESI: resolve system id via universe/ids for name=%q\n", name) - req, err := http.NewRequestWithContext(ctx, http.MethodPost, idsURL, strings.NewReader(string(body))) - if err == nil { - req.Header.Set("Content-Type", "application/json") - req.Header.Set("Accept", "application/json") - resp, errDo := http.DefaultClient.Do(req) - if errDo == nil { - defer resp.Body.Close() - if resp.StatusCode == http.StatusOK { - var idsResp struct { - Systems []struct { - ID int64 `json:"id"` - Name string `json:"name"` - } `json:"systems"` - } - if err := json.NewDecoder(resp.Body).Decode(&idsResp); err == nil { - if len(idsResp.Systems) > 0 { - fmt.Printf("ESI: universe/ids hit: %s -> %d\n", idsResp.Systems[0].Name, idsResp.Systems[0].ID) - return idsResp.Systems[0].ID, nil - } - } - } - } - } - - // 2) Fallback: strict search - q := url.Values{} - q.Set("categories", "solar_system") - q.Set("search", name) - q.Set("strict", "true") - searchURL := esiBase + "/v3/search/?" + q.Encode() - fmt.Printf("ESI: strict search for %q\n", name) - req2, err := http.NewRequestWithContext(ctx, http.MethodGet, searchURL, nil) - if err != nil { - return 0, err - } - req2.Header.Set("Accept", "application/json") - resp2, err := http.DefaultClient.Do(req2) - if err == nil { - defer resp2.Body.Close() - if resp2.StatusCode == http.StatusOK { - var payload struct { - SolarSystem []int64 `json:"solar_system"` - } - if err := json.NewDecoder(resp2.Body).Decode(&payload); err == nil && len(payload.SolarSystem) > 0 { - fmt.Printf("ESI: strict search hit: %d\n", payload.SolarSystem[0]) - return payload.SolarSystem[0], nil - } - } - } - - // 3) Fallback: non-strict search then best-effort name match via universe/names - q.Set("strict", "false") - searchURL2 := esiBase + "/v3/search/?" + q.Encode() - fmt.Printf("ESI: non-strict search for %q\n", name) - req3, err := http.NewRequestWithContext(ctx, http.MethodGet, searchURL2, nil) - if err != nil { - return 0, err - } - req3.Header.Set("Accept", "application/json") - resp3, err := http.DefaultClient.Do(req3) - if err != nil { - return 0, err - } - defer resp3.Body.Close() - if resp3.StatusCode != http.StatusOK { - b, _ := io.ReadAll(resp3.Body) - return 0, fmt.Errorf("search failed: %s: %s", resp3.Status, string(b)) - } - var payload struct { - SolarSystem []int64 `json:"solar_system"` - } - if err := json.NewDecoder(resp3.Body).Decode(&payload); err != nil || len(payload.SolarSystem) == 0 { - return 0, fmt.Errorf("system not found: %s", name) - } - // If one result, return it - if len(payload.SolarSystem) == 1 { - fmt.Printf("ESI: non-strict search single hit: %d\n", payload.SolarSystem[0]) - return payload.SolarSystem[0], nil - } - // Multiple: resolve names and pick exact case-insensitive match if possible - ids := payload.SolarSystem - var idNamesReq = make([]int64, 0, len(ids)) - idNamesReq = append(idNamesReq, ids...) - - namesURL := esiBase + "/v3/universe/names/?datasource=tranquility" - idsBody, _ := json.Marshal(idNamesReq) - req4, err := http.NewRequestWithContext(ctx, http.MethodPost, namesURL, strings.NewReader(string(idsBody))) - if err != nil { - return 0, err - } - req4.Header.Set("Content-Type", "application/json") - req4.Header.Set("Accept", "application/json") - resp4, err := http.DefaultClient.Do(req4) - if err != nil { - return 0, err - } - defer resp4.Body.Close() - if resp4.StatusCode != http.StatusOK { - b, _ := io.ReadAll(resp4.Body) - return 0, fmt.Errorf("names lookup failed: %s: %s", resp4.Status, string(b)) - } - var namesResp []struct { - Category string `json:"category"` - ID int64 `json:"id"` - Name string `json:"name"` - } - if err := json.NewDecoder(resp4.Body).Decode(&namesResp); err != nil { - return 0, err - } - lower := strings.ToLower(name) - for _, n := range namesResp { - if n.Category == "solar_system" && strings.ToLower(n.Name) == lower { - fmt.Printf("ESI: names resolved exact: %s -> %d\n", n.Name, n.ID) - return n.ID, nil - } - } - // Fallback: return first - fmt.Printf("ESI: names resolved fallback: returning %d for %q\n", namesResp[0].ID, name) - return namesResp[0].ID, nil +type SSOStatus struct { + LoggedIn bool + CharacterID int64 + CharacterName string + ExpiresAt time.Time } -// Helpers - type tokenResponse struct { AccessToken string `json:"access_token"` RefreshToken string `json:"refresh_token"` @@ -615,7 +547,6 @@ func parseTokenCharacter(jwt string) (name string, id int64) { name = v } if v, ok := m["sub"].(string); ok { - // format EVE:CHARACTER: if idx := strings.LastIndexByte(v, ':'); idx > -1 { if idv, err := strconv.ParseInt(v[idx+1:], 10, 64); err == nil { id = idv @@ -623,4 +554,120 @@ func parseTokenCharacter(jwt string) (name string, id int64) { } } return +} + +// ResolveSystemIDByName ... DB-first then ESI fallbacks +func (s *ESISSO) ResolveSystemIDByName(ctx context.Context, name string) (int64, error) { + name = strings.TrimSpace(name) + if name == "" { + return 0, errors.New("empty system name") + } + if s.db != nil { + var sys SolarSystem + if err := s.db.Where("solarSystemName = ?", name).First(&sys).Error; err == nil && sys.SolarSystemID != 0 { + fmt.Printf("DB: resolved %q -> %d\n", name, sys.SolarSystemID) + return sys.SolarSystemID, nil + } + } + // Fallbacks (universe/ids -> strict search -> non-strict + names) + type idsReq struct{ Names []string `json:"names"` } + body, _ := json.Marshal(idsReq{Names: []string{name}}) + idsURL := esiBase + "/v3/universe/ids/?datasource=tranquility" + fmt.Printf("ESI: resolve system id via universe/ids for name=%q\n", name) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, idsURL, strings.NewReader(string(body))) + if err == nil { + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Accept", "application/json") + resp, errDo := http.DefaultClient.Do(req) + if errDo == nil { + defer resp.Body.Close() + if resp.StatusCode == http.StatusOK { + var idsResp struct{ Systems []struct{ ID int64 `json:"id"`; Name string `json:"name"` } `json:"systems"` } + if err := json.NewDecoder(resp.Body).Decode(&idsResp); err == nil { + if len(idsResp.Systems) > 0 { + fmt.Printf("ESI: universe/ids hit: %s -> %d\n", idsResp.Systems[0].Name, idsResp.Systems[0].ID) + return idsResp.Systems[0].ID, nil + } + } + } + } + } + q := url.Values{} + q.Set("categories", "solar_system") + q.Set("search", name) + q.Set("strict", "true") + searchURL := esiBase + "/v3/search/?" + q.Encode() + fmt.Printf("ESI: strict search for %q\n", name) + req2, err := http.NewRequestWithContext(ctx, http.MethodGet, searchURL, nil) + if err != nil { + return 0, err + } + req2.Header.Set("Accept", "application/json") + resp2, err := http.DefaultClient.Do(req2) + if err == nil { + defer resp2.Body.Close() + if resp2.StatusCode == http.StatusOK { + var payload struct{ SolarSystem []int64 `json:"solar_system"` } + if err := json.NewDecoder(resp2.Body).Decode(&payload); err == nil && len(payload.SolarSystem) > 0 { + fmt.Printf("ESI: strict search hit: %d\n", payload.SolarSystem[0]) + return payload.SolarSystem[0], nil + } + } + } + q.Set("strict", "false") + searchURL2 := esiBase + "/v3/search/?" + q.Encode() + fmt.Printf("ESI: non-strict search for %q\n", name) + req3, err := http.NewRequestWithContext(ctx, http.MethodGet, searchURL2, nil) + if err != nil { + return 0, err + } + req3.Header.Set("Accept", "application/json") + resp3, err := http.DefaultClient.Do(req3) + if err != nil { + return 0, err + } + defer resp3.Body.Close() + if resp3.StatusCode != http.StatusOK { + b, _ := io.ReadAll(resp3.Body) + return 0, fmt.Errorf("search failed: %s: %s", resp3.Status, string(b)) + } + var payload struct{ SolarSystem []int64 `json:"solar_system"` } + if err := json.NewDecoder(resp3.Body).Decode(&payload); err != nil || len(payload.SolarSystem) == 0 { + return 0, fmt.Errorf("system not found: %s", name) + } + if len(payload.SolarSystem) == 1 { + fmt.Printf("ESI: non-strict search single hit: %d\n", payload.SolarSystem[0]) + return payload.SolarSystem[0], nil + } + ids := payload.SolarSystem + namesURL := esiBase + "/v3/universe/names/?datasource=tranquility" + idsBody, _ := json.Marshal(ids) + req4, err := http.NewRequestWithContext(ctx, http.MethodPost, namesURL, strings.NewReader(string(idsBody))) + if err != nil { + return 0, err + } + req4.Header.Set("Content-Type", "application/json") + req4.Header.Set("Accept", "application/json") + resp4, err := http.DefaultClient.Do(req4) + if err != nil { + return 0, err + } + defer resp4.Body.Close() + if resp4.StatusCode != http.StatusOK { + b, _ := io.ReadAll(resp4.Body) + return 0, fmt.Errorf("names lookup failed: %s: %s", resp4.Status, string(b)) + } + var namesResp []struct{ Category string `json:"category"`; ID int64 `json:"id"`; Name string `json:"name"` } + if err := json.NewDecoder(resp4.Body).Decode(&namesResp); err != nil { + return 0, err + } + lower := strings.ToLower(name) + for _, n := range namesResp { + if n.Category == "solar_system" && strings.ToLower(n.Name) == lower { + fmt.Printf("ESI: names resolved exact: %s -> %d\n", n.Name, n.ID) + return n.ID, nil + } + } + fmt.Printf("ESI: names resolved fallback: returning %d for %q\n", namesResp[0].ID, name) + return namesResp[0].ID, nil } \ No newline at end of file diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 8511848..4da707e 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -11,7 +11,7 @@ import { } from '@/components/ui/breadcrumb'; import { Button } from '@/components/ui/button'; import { toast } from '@/hooks/use-toast'; -import { StartESILogin, ESILoginStatus, ESILoggedIn } from 'wailsjs/go/main/App'; +import { StartESILogin, ESILoggedIn, ListCharacters } from 'wailsjs/go/main/App'; interface HeaderProps { title: string; @@ -21,24 +21,31 @@ interface HeaderProps { }>; } +interface CharacterInfo { character_id: number; character_name: string } + export const Header = ({ title, breadcrumbs = [] }: HeaderProps) => { const navigate = useNavigate(); - const [status, setStatus] = useState(''); + const [chars, setChars] = useState([]); + + const refreshState = async () => { + try { + const list = await ListCharacters(); + setChars((list as any[]).map((c: any) => ({ character_id: c.character_id, character_name: c.character_name }))); + } catch {} + }; useEffect(() => { - ESILoginStatus().then(setStatus).catch(() => setStatus('')); + refreshState(); }, []); const handleLogin = async () => { try { await StartESILogin(); toast({ title: 'EVE Login', description: 'Complete login in your browser.' }); - // Poll a few times to update status after redirect callback for (let i = 0; i < 20; i++) { const ok = await ESILoggedIn(); if (ok) { - const s = await ESILoginStatus(); - setStatus(s); + await refreshState(); break; } await new Promise(r => setTimeout(r, 500)); @@ -50,7 +57,6 @@ export const Header = ({ title, breadcrumbs = [] }: HeaderProps) => { return (
- {/* Breadcrumb Navigation */} {breadcrumbs.length > 0 && (
@@ -79,11 +85,18 @@ export const Header = ({ title, breadcrumbs = [] }: HeaderProps) => {
)} - {/* Title + EVE SSO */}

{title}

-
- {status || 'EVE: not logged in'} +
+ {chars.length > 0 && ( +
+ {chars.map((c) => ( + + {c.character_name} + + ))} +
+ )}
diff --git a/frontend/src/components/SystemContextMenu.tsx b/frontend/src/components/SystemContextMenu.tsx index 3ceda3a..f988b99 100644 --- a/frontend/src/components/SystemContextMenu.tsx +++ b/frontend/src/components/SystemContextMenu.tsx @@ -1,7 +1,7 @@ import { useState, useRef } from 'react'; import { System } from '@/lib/types'; import { toast } from '@/hooks/use-toast'; -import { StartESILogin, ESILoginStatus, SetDestinationByName } from 'wailsjs/go/main/App'; +import { StartESILogin, ListCharacters, SetDestinationForAll } from 'wailsjs/go/main/App'; interface SystemContextMenuProps { x: number; @@ -29,15 +29,24 @@ export const SystemContextMenu = ({ x, y, system, onRename, onDelete, onClearCon setIsRenaming(false); }; - const handleSetDestination = async () => { + const ensureLoggedInAny = async () => { try { - const status = await ESILoginStatus(); - if (status.includes('not logged in')) { - await StartESILogin(); - toast({ title: 'EVE Login', description: 'Please complete login in your browser, then retry.' }); - return; - } - await SetDestinationByName(system.solarSystemName, true, false); + const list = await ListCharacters(); + if (Array.isArray(list) && list.length > 0) return true; + await StartESILogin(); + toast({ title: 'EVE Login', description: 'Please complete login in your browser, then retry.' }); + return false; + } catch { + await StartESILogin(); + toast({ title: 'EVE Login', description: 'Please complete login in your browser, then retry.' }); + return false; + } + }; + + const handleSetDestinationAll = async () => { + try { + if (!(await ensureLoggedInAny())) return; + await SetDestinationForAll(system.solarSystemName, true, false); toast({ title: 'Destination set', description: `${system.solarSystemName}` }); onClose(); } catch (e: any) { @@ -102,8 +111,8 @@ export const SystemContextMenu = ({ x, y, system, onRename, onDelete, onClearCon
diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts index 87d63e8..3a3c2f0 100644 --- a/frontend/wailsjs/go/main/App.d.ts +++ b/frontend/wailsjs/go/main/App.d.ts @@ -1,5 +1,6 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT +import {main} from '../models'; export function ESILoggedIn():Promise; @@ -7,8 +8,12 @@ export function ESILoginStatus():Promise; export function Greet(arg1:string):Promise; +export function ListCharacters():Promise>; + export function SetDestination(arg1:number,arg2:boolean,arg3:boolean):Promise; export function SetDestinationByName(arg1:string,arg2:boolean,arg3:boolean):Promise; +export function SetDestinationForAll(arg1:string,arg2:boolean,arg3:boolean):Promise; + export function StartESILogin():Promise; diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js index b79c77a..2ab77b1 100644 --- a/frontend/wailsjs/go/main/App.js +++ b/frontend/wailsjs/go/main/App.js @@ -14,6 +14,10 @@ export function Greet(arg1) { return window['go']['main']['App']['Greet'](arg1); } +export function ListCharacters() { + return window['go']['main']['App']['ListCharacters'](); +} + export function SetDestination(arg1, arg2, arg3) { return window['go']['main']['App']['SetDestination'](arg1, arg2, arg3); } @@ -22,6 +26,10 @@ export function SetDestinationByName(arg1, arg2, arg3) { return window['go']['main']['App']['SetDestinationByName'](arg1, arg2, arg3); } +export function SetDestinationForAll(arg1, arg2, arg3) { + return window['go']['main']['App']['SetDestinationForAll'](arg1, arg2, arg3); +} + export function StartESILogin() { return window['go']['main']['App']['StartESILogin'](); } diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts new file mode 100644 index 0000000..6ad18e2 --- /dev/null +++ b/frontend/wailsjs/go/models.ts @@ -0,0 +1,19 @@ +export namespace main { + + export class CharacterInfo { + character_id: number; + character_name: string; + + static createFrom(source: any = {}) { + return new CharacterInfo(source); + } + + constructor(source: any = {}) { + if ('string' === typeof source) source = JSON.parse(source); + this.character_id = source["character_id"]; + this.character_name = source["character_name"]; + } + } + +} + diff --git a/go.mod b/go.mod index 57a1758..aebd119 100644 --- a/go.mod +++ b/go.mod @@ -1,46 +1,46 @@ module signalerr -go 1.21 +go 1.22.0 toolchain go1.23.6 require ( - github.com/wailsapp/wails/v2 v2.9.2 + github.com/wailsapp/wails/v2 v2.10.2 gorm.io/driver/sqlite v1.5.7 gorm.io/gorm v1.25.10 ) require ( github.com/bep/debounce v1.2.1 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/labstack/echo/v4 v4.10.2 // indirect - github.com/labstack/gommon v0.4.0 // indirect - github.com/leaanthony/go-ansi-parser v1.6.0 // indirect - github.com/leaanthony/gosod v1.0.3 // indirect + github.com/labstack/echo/v4 v4.13.3 // indirect + github.com/labstack/gommon v0.4.2 // indirect + github.com/leaanthony/go-ansi-parser v1.6.1 // indirect + github.com/leaanthony/gosod v1.0.4 // indirect github.com/leaanthony/slicer v1.6.0 // indirect - github.com/leaanthony/u v1.1.0 // indirect + github.com/leaanthony/u v1.1.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.22 // indirect - github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/rivo/uniseg v0.4.4 // indirect - github.com/samber/lo v1.38.1 // indirect - github.com/tkrajina/go-reflector v0.5.6 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/samber/lo v1.49.1 // indirect + github.com/tkrajina/go-reflector v0.5.8 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - github.com/wailsapp/go-webview2 v1.0.16 // indirect + github.com/wailsapp/go-webview2 v1.0.19 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect - golang.org/x/crypto v0.23.0 // indirect - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect ) // replace github.com/wailsapp/wails/v2 v2.9.2 => C:\Users\Administrator\go\pkg\mod diff --git a/go.sum b/go.sum index 0637032..6d4915c 100644 --- a/go.sum +++ b/go.sum @@ -1,101 +1,88 @@ github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY= github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck= github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M= -github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k= -github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= -github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= +github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY= +github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc= github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA= -github.com/leaanthony/go-ansi-parser v1.6.0 h1:T8TuMhFB6TUMIUm0oRrSbgJudTFw9csT3ZK09w0t4Pg= -github.com/leaanthony/go-ansi-parser v1.6.0/go.mod h1:+vva/2y4alzVmmIEpk9QDhA7vLC5zKDTRwfZGOp3IWU= -github.com/leaanthony/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ= -github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4= -github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY= +github.com/leaanthony/go-ansi-parser v1.6.1 h1:xd8bzARK3dErqkPFtoF9F3/HgN8UQk0ed1YDKpEz01A= +github.com/leaanthony/go-ansi-parser v1.6.1/go.mod h1:+vva/2y4alzVmmIEpk9QDhA7vLC5zKDTRwfZGOp3IWU= +github.com/leaanthony/gosod v1.0.4 h1:YLAbVyd591MRffDgxUOU1NwLhT9T1/YiwjKZpkNFeaI= +github.com/leaanthony/gosod v1.0.4/go.mod h1:GKuIL0zzPj3O1SdWQOdgURSuhkF+Urizzxh26t9f1cw= github.com/leaanthony/slicer v1.6.0 h1:1RFP5uiPJvT93TAHi+ipd3NACobkW53yUiBqZheE/Js= github.com/leaanthony/slicer v1.6.0/go.mod h1:o/Iz29g7LN0GqH3aMjWAe90381nyZlDNquK+mtH2Fj8= -github.com/leaanthony/u v1.1.0 h1:2n0d2BwPVXSUq5yhe8lJPHdxevE2qK5G99PMStMZMaI= -github.com/leaanthony/u v1.1.0/go.mod h1:9+o6hejoRljvZ3BzdYlVL0JYCwtnAsVuN9pVTQcaRfI= -github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= +github.com/leaanthony/u v1.1.1 h1:TUFjwDGlNX+WuwVEzDqQwC2lOv0P4uhTQw7CMFdiK7M= +github.com/leaanthony/u v1.1.1/go.mod h1:9+o6hejoRljvZ3BzdYlVL0JYCwtnAsVuN9pVTQcaRfI= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ= +github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= -github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= -github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= -github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE= -github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew= +github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ= +github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/wailsapp/go-webview2 v1.0.16 h1:wffnvnkkLvhRex/aOrA3R7FP7rkvOqL/bir1br7BekU= -github.com/wailsapp/go-webview2 v1.0.16/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= +github.com/wailsapp/go-webview2 v1.0.19 h1:7U3QcDj1PrBPaxJNCui2k1SkWml+Q5kvFUFyTImA6NU= +github.com/wailsapp/go-webview2 v1.0.19/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc= github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs= github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= -github.com/wailsapp/wails/v2 v2.9.2 h1:Xb5YRTos1w5N7DTMyYegWaGukCP2fIaX9WF21kPPF2k= -github.com/wailsapp/wails/v2 v2.9.2/go.mod h1:uehvlCwJSFcBq7rMCGfk4rxca67QQGsbg5Nm4m9UnBs= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +github.com/wailsapp/wails/v2 v2.10.2 h1:29U+c5PI4K4hbx8yFbFvwpCuvqK9VgNv8WGobIlKlXk= +github.com/wailsapp/wails/v2 v2.10.2/go.mod h1:XuN4IUOPpzBrHUkEd7sCU5ln4T/p1wQedfxP7fKik+4= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.5.7 h1:8NvsrhP0ifM7LX9G4zPB97NwovUakUxc+2V2uuf3Z1I=