Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions app.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,14 @@ func (a *App) startup(ctx context.Context) {
a.deviceInfoCache = deviceInfoCache

a.metadata = vellum.NewMetadataStore()
if err := a.metadata.Load(); err != nil {
fmt.Printf("Warning: could not load metadata: %v\n", err)
}
go func() {
if err := a.metadata.Load(); err != nil {
debug.Printf("[DEBUG] Failed to load metadata: %v\n", err)
runtime.EventsEmit(a.ctx, "metadata:error", err.Error())
return
}
runtime.EventsEmit(a.ctx, "metadata:loaded")
}()

go func() {
settings.OnSignalSettingChanged(func(changed settings.Changed) {
Expand Down
3 changes: 3 additions & 0 deletions app_packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ func (a *App) RefreshMetadata() error {

func (a *App) GetPackages(deviceType, firmware, arch string) []PackageInfo {
debug.Printf("[DEBUG] GetPackages called, metadata=%p, deviceType=%s, firmware=%s, arch=%s\n", a.metadata, deviceType, firmware, arch)
if a.metadata == nil || !a.metadata.Ready() {
return []PackageInfo{}
}
packages := a.metadata.GetAllPackagesForDevice(deviceType, firmware, arch)
debug.Printf("[DEBUG] GetPackages got %d packages\n", len(packages))
result := []PackageInfo{}
Expand Down
17 changes: 14 additions & 3 deletions frontend/src/pages/ConnectPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useRef, useMemo } from 'react'
import { useState, useRef, useMemo, useEffect } from 'react'
import { toast } from 'sonner'
import { handleError, getUserFriendlyMessage } from '@/lib/errorMessages'
import { Button } from '@/components/ui/button'
Expand Down Expand Up @@ -43,13 +43,24 @@ export function ConnectPage({
const [showPassword, setShowPassword] = useState(false)
const [keyPassphrase, setKeyPassphrase] = useState('')
const [showKeyPassphrase, setShowKeyPassphrase] = useState(false)
const [availableKeys] = useState<SSHKey[]>(initialKeys)
const [availableKeys, setAvailableKeys] = useState<SSHKey[]>(initialKeys)
const [selectedKey, setSelectedKey] = useState<string>(initialKeys.length > 0 ? initialKeys[0].path : '')
const [customKeyName, setCustomKeyName] = useState<string>('')
const [sshAgentAvailable] = useState(initialAgentAvailable)
const [sshAgentAvailable, setSSHAgentAvailable] = useState(initialAgentAvailable)
const [connecting, setConnecting] = useState(false)
const connectAttemptRef = useRef(0)

useEffect(() => {
setAvailableKeys(initialKeys)
if (initialKeys.length > 0 && !selectedKey) {
setSelectedKey(initialKeys[0].path)
}
}, [initialKeys])

useEffect(() => {
setSSHAgentAvailable(initialAgentAvailable)
}, [initialAgentAvailable])

const [showAddForm, setShowAddForm] = useState(false)
const [editingDevice, setEditingDevice] = useState<SavedDevice | null>(null)
const [deviceName, setDeviceName] = useState('')
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/rmitchellscott/remarkable-go v0.3.0 h1:4Fr0Dw1IIGXPz67TH8wKaKdAQpOwKwYvyUgAKng8ho0=
github.com/rmitchellscott/remarkable-go v0.3.0/go.mod h1:thnO3JUMAzlyRbl0jxwqDlSVWcwoco+F4wR9ohg5Pjg=
github.com/rmitchellscott/remarkable-go v0.3.1 h1:mBe4KdpOVOziQVRmh5b2TAIBwujWIL0MusjHyVCscYA=
github.com/rmitchellscott/remarkable-go v0.3.1/go.mod h1:thnO3JUMAzlyRbl0jxwqDlSVWcwoco+F4wR9ohg5Pjg=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
Expand Down
59 changes: 0 additions & 59 deletions internal/vellum/fallback_packages.json

This file was deleted.

48 changes: 0 additions & 48 deletions internal/vellum/fallback_remanager.json

This file was deleted.

33 changes: 17 additions & 16 deletions internal/vellum/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import (
"sync"
"time"

_ "embed"

"reManager/internal/debug"
"reManager/internal/httputil"
versionpkg "reManager/internal/version"
Expand All @@ -22,12 +20,6 @@ const (
MetadataTimeout = 10 * time.Second
)

//go:embed fallback_packages.json
var fallbackPackagesJSON []byte

//go:embed fallback_remanager.json
var fallbackRemanagerJSON []byte

type OSConstraint struct {
Version string `json:"version"`
Operator string `json:"operator"`
Expand Down Expand Up @@ -137,6 +129,8 @@ type MetadataStore struct {
mu sync.RWMutex
packages PackagesMetadata
remanager RemanagerMetadata
loaded bool
err error
}

func NewMetadataStore() *MetadataStore {
Expand All @@ -145,25 +139,30 @@ func NewMetadataStore() *MetadataStore {

func (m *MetadataStore) Load() error {
if err := m.loadPackagesMetadata(); err != nil {
debug.Printf("[DEBUG] HTTP fetch packages failed: %v, using fallback\n", err)
if err := json.Unmarshal(fallbackPackagesJSON, &m.packages); err != nil {
return fmt.Errorf("failed to parse fallback packages metadata: %w", err)
}
m.err = fmt.Errorf("failed to fetch packages metadata: %w", err)
return m.err
}
normalizePackagesMetadata(&m.packages)
debug.Printf("[DEBUG] Loaded %d packages from metadata\n", len(m.packages.Packages))

if err := m.loadRemanagerMetadata(); err != nil {
debug.Printf("[DEBUG] HTTP fetch remanager failed: %v, using fallback\n", err)
if err := json.Unmarshal(fallbackRemanagerJSON, &m.remanager); err != nil {
return fmt.Errorf("failed to parse fallback remanager metadata: %w", err)
}
m.err = fmt.Errorf("failed to fetch remanager metadata: %w", err)
return m.err
}
debug.Printf("[DEBUG] Loaded %d remanager package configs\n", len(m.remanager.Packages))

m.loaded = true
return nil
}

func (m *MetadataStore) Ready() bool {
return m.loaded
}

func (m *MetadataStore) Err() error {
return m.err
}

func (m *MetadataStore) Refresh() error {
client := httputil.NewClient(MetadataTimeout)

Expand Down Expand Up @@ -207,6 +206,8 @@ func (m *MetadataStore) Refresh() error {
if len(newRemanager.Packages) > 0 {
m.remanager = newRemanager
}
m.loaded = true
m.err = nil
m.mu.Unlock()

debug.Printf("[DEBUG] Refreshed metadata: %d packages, %d remanager configs\n", len(m.packages.Packages), len(m.remanager.Packages))
Expand Down
Loading