change to atomic.bool for fetching details / smart

internal/hub/systems/system.go

@@ -6,11 +6,10 @@ import (
 	"errors"
 	"fmt"
 	"hash/fnv"
-	"log/slog"
 	"math/rand"
 	"net"
 	"strings"
-	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/henrygd/beszel/internal/common"
@@ -30,20 +29,21 @@ import (
 )
 
 type System struct {
-	Id           string               `db:"id"`
-	Host         string               `db:"host"`
-	Port         string               `db:"port"`
-	Status       string               `db:"status"`
-	manager      *SystemManager       // Manager that this system belongs to
-	client       *ssh.Client          // SSH client for fetching data
-	data         *system.CombinedData // system data from agent
-	ctx          context.Context      // Context for stopping the updater
-	cancel       context.CancelFunc   // Stops and removes system from updater
-	WsConn       *ws.WsConn           // Handler for agent WebSocket connection
-	agentVersion semver.Version       // Agent version
-	updateTicker *time.Ticker         // Ticker for updating the system
-	smartOnce    sync.Once            // Once for fetching and saving smart devices
-	detailsOnce  sync.Once            // Once for fetching and saving static system details
+	Id             string               `db:"id"`
+	Host           string               `db:"host"`
+	Port           string               `db:"port"`
+	Status         string               `db:"status"`
+	manager        *SystemManager       // Manager that this system belongs to
+	client         *ssh.Client          // SSH client for fetching data
+	data           *system.CombinedData // system data from agent
+	ctx            context.Context      // Context for stopping the updater
+	cancel         context.CancelFunc   // Stops and removes system from updater
+	WsConn         *ws.WsConn           // Handler for agent WebSocket connection
+	agentVersion   semver.Version       // Agent version
+	updateTicker   *time.Ticker         // Ticker for updating the system
+	detailsFetched atomic.Bool          // True if static system details have been fetched and saved
+	smartFetched   atomic.Bool          // True if SMART devices have been fetched and saved
+	smartFetching  atomic.Bool          // True if SMART devices are currently being fetched
 }
 
 func (sm *SystemManager) NewSystem(systemId string) *System {
@@ -119,10 +119,10 @@ func (sys *System) update() error {
 	options := common.DataRequestOptions{
 		CacheTimeMs: uint16(interval),
 	}
-	// fetch system details only on the first update
-	sys.detailsOnce.Do(func() {
+	// fetch system details if not already fetched
+	if !sys.detailsFetched.Load() {
 		options.IncludeDetails = true
-	})
+	}
 	data, err := sys.fetchDataFromAgent(options)
 	if err == nil {
 		_, err = sys.createRecords(data)
@@ -151,18 +151,11 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 	}
 	hub := sys.manager.hub
 	err = hub.RunInTransaction(func(txApp core.App) error {
-		if data.Details != nil {
-			slog.Info("Static info", "data", data.Details)
-			if err := createStaticInfoRecord(txApp, data.Details, sys.Id); err != nil {
-				return err
-			}
-		}
-		// add system_stats and container_stats records
+		// add system_stats record
 		systemStatsCollection, err := txApp.FindCachedCollectionByNameOrId("system_stats")
 		if err != nil {
 			return err
 		}
-
 		systemStatsRecord := core.NewRecord(systemStatsCollection)
 		systemStatsRecord.Set("system", systemRecord.Id)
 		systemStatsRecord.Set("stats", data.Stats)
@@ -170,14 +163,14 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 		if err := txApp.SaveNoValidate(systemStatsRecord); err != nil {
 			return err
 		}
+
+		// add containers and container_stats records
 		if len(data.Containers) > 0 {
-			// add / update containers records
 			if data.Containers[0].Id != "" {
 				if err := createContainerRecords(txApp, data.Containers, sys.Id); err != nil {
 					return err
 				}
 			}
-			// add new container_stats record
 			containerStatsCollection, err := txApp.FindCachedCollectionByNameOrId("container_stats")
 			if err != nil {
 				return err
@@ -198,9 +191,16 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 			}
 		}
 
+		// add system details record
+		if data.Details != nil {
+			if err := createSystemDetailsRecord(txApp, data.Details, sys.Id); err != nil {
+				return err
+			}
+			sys.detailsFetched.Store(true)
+		}
+
 		// update system record (do this last because it triggers alerts and we need above records to be inserted first)
 		systemRecord.Set("status", up)
-
 		systemRecord.Set("info", data.Info)
 		if err := txApp.SaveNoValidate(systemRecord); err != nil {
 			return err
@@ -210,36 +210,42 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 
 	// Fetch and save SMART devices when system first comes online
 	if err == nil {
-		sys.smartOnce.Do(func() {
-			go sys.FetchAndSaveSmartDevices()
-		})
+		if !sys.smartFetched.Load() && sys.smartFetching.CompareAndSwap(false, true) {
+			go func() {
+				defer sys.smartFetching.Store(false)
+				if err := sys.FetchAndSaveSmartDevices(); err == nil {
+					sys.smartFetched.Store(true)
+				}
+			}()
+		}
 	}
 
 	return systemRecord, err
 }
 
-func createStaticInfoRecord(app core.App, data *system.Details, systemId string) error {
-	record, err := app.FindRecordById("system_details", systemId)
-	if err != nil {
-		collection, err := app.FindCollectionByNameOrId("system_details")
-		if err != nil {
-			return err
-		}
-		record = core.NewRecord(collection)
-		record.Set("id", systemId)
+func createSystemDetailsRecord(app core.App, data *system.Details, systemId string) error {
+	collectionName := "system_details"
+	params := dbx.Params{
+		"id":       systemId,
+		"system":   systemId,
+		"hostname": data.Hostname,
+		"kernel":   data.Kernel,
+		"cores":    data.Cores,
+		"threads":  data.Threads,
+		"cpu":      data.CpuModel,
+		"os":       data.Os,
+		"os_name":  data.OsName,
+		"arch":     data.Arch,
+		"memory":   data.MemoryTotal,
+		"podman":   data.Podman,
+		"updated":  time.Now().UTC(),
 	}
-	record.Set("system", systemId)
-	record.Set("hostname", data.Hostname)
-	record.Set("kernel", data.Kernel)
-	record.Set("cores", data.Cores)
-	record.Set("threads", data.Threads)
-	record.Set("cpu", data.CpuModel)
-	record.Set("os", data.Os)
-	record.Set("os_name", data.OsName)
-	record.Set("arch", data.Arch)
-	record.Set("memory", data.MemoryTotal)
-	record.Set("podman", data.Podman)
-	return app.SaveNoValidate(record)
+	result, err := app.DB().Update(collectionName, params, dbx.HashExp{"id": systemId}).Execute()
+	rowsAffected, _ := result.RowsAffected()
+	if err != nil || rowsAffected == 0 {
+		_, err = app.DB().Insert(collectionName, params).Execute()
+	}
+	return err
 }
 
 func createSystemdStatsRecords(app core.App, data []*systemd.Service, systemId string) error {

internal/site/biome.json

@@ -33,10 +33,7 @@
 				"noUnusedFunctionParameters": "error",
 				"noUnusedPrivateClassMembers": "error",
 				"useExhaustiveDependencies": {
-					"level": "warn",
-					"options": {
-						"reportUnnecessaryDependencies": false
-					}
+					"level": "off"
 				},
 				"useUniqueElementIds": "off",
 				"noUnusedVariables": "error"

internal/site/src/components/routes/system/info-bar.tsx

@@ -1,10 +1,5 @@
-import ChartTimeSelect from "@/components/charts/chart-time-select"
-import { Button } from "@/components/ui/button"
-import { Card } from "@/components/ui/card"
-import { FreeBsdIcon, TuxIcon, WebSocketIcon, WindowsIcon } from "@/components/ui/icons"
-import { SystemStatus, ConnectionType, connectionTypeLabels, Os } from "@/lib/enums"
-import { cn, formatBytes, getHostDisplayValue, secondsToString, toFixedFloat } from "@/lib/utils"
-import { Separator } from "@/components/ui/separator"
+import { plural } from "@lingui/core/macro"
+import { useLingui } from "@lingui/react/macro"
 import {
 	AppleIcon,
 	ChevronRightSquareIcon,
@@ -12,16 +7,21 @@ import {
 	CpuIcon,
 	GlobeIcon,
 	LayoutGridIcon,
+	MemoryStickIcon,
 	MonitorIcon,
 	Rows,
-	MemoryStickIcon,
 } from "lucide-react"
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
-import type { ChartData, SystemDetailsRecord, SystemRecord } from "@/types"
 import { useEffect, useMemo, useState } from "react"
-import { useLingui } from "@lingui/react/macro"
+import ChartTimeSelect from "@/components/charts/chart-time-select"
+import { Button } from "@/components/ui/button"
+import { Card } from "@/components/ui/card"
+import { FreeBsdIcon, TuxIcon, WebSocketIcon, WindowsIcon } from "@/components/ui/icons"
+import { Separator } from "@/components/ui/separator"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
 import { pb } from "@/lib/api"
-import { plural } from "@lingui/core/macro"
+import { ConnectionType, connectionTypeLabels, Os, SystemStatus } from "@/lib/enums"
+import { cn, formatBytes, getHostDisplayValue, secondsToString, toFixedFloat } from "@/lib/utils"
+import type { ChartData, SystemDetailsRecord, SystemRecord } from "@/types"
 
 export default function InfoBar({
 	system,
@@ -41,6 +41,7 @@ export default function InfoBar({
 
 	// Fetch system_details on mount / when system changes
 	useEffect(() => {
+		let active = true
 		setDetails(null)
 		// skip fetching system details if agent is older version which includes details in Info struct
 		if (!system.id || system.info?.m) {
@@ -54,10 +55,16 @@ export default function InfoBar({
 				},
 			})
 			.then((details) => {
-				setDetails(details)
-				setIsPodman(details.podman)
+				if (active) {
+					setDetails(details)
+					setIsPodman(details.podman)
+				}
 			})
-			.catch(() => setDetails(null))
+			.catch(() => {})
+
+		return () => {
+			active = false
+		}
 	}, [system.id])
 
 	// values for system info bar - use details with fallback to system.info