Merge 77b3e95550 into 6d13e1be12

Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.30.0 to 7.6.3.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.6.3/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-version: 7.6.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

internal/confparser/confparser_test.go

@@ -43,11 +43,9 @@ type testNetworkConfig struct {
 	LLDPTxTLVs              []string    `json:"lldp_tx_tlvs,omitempty" one_of:"chassis,port,system,vlan" default:"chassis,port,system,vlan"`
 	MDNSMode                null.String `json:"mdns_mode,omitempty" one_of:"disabled,auto,ipv4_only,ipv6_only" default:"auto"`
 	TimeSyncMode            null.String `json:"time_sync_mode,omitempty" one_of:"ntp_only,ntp_and_http,http_only,custom" default:"ntp_and_http"`
-	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,http_user_provided" default:"ntp,http"`
+	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,ntp_fallback" default:"ntp,http"`
 	TimeSyncDisableFallback null.Bool   `json:"time_sync_disable_fallback,omitempty" default:"false"`
 	TimeSyncParallel        null.Int    `json:"time_sync_parallel,omitempty" default:"4"`
-	TimeSyncNTPServers      []string    `json:"time_sync_ntp_servers,omitempty" validate_type:"ipv4_or_ipv6" required_if:"TimeSyncOrdering=ntp_user_provided"`
-	TimeSyncHTTPUrls        []string    `json:"time_sync_http_urls,omitempty" validate_type:"url" required_if:"TimeSyncOrdering=http_user_provided"`
 }
 
 func TestValidateConfig(t *testing.T) {

internal/network/config.go

@@ -45,11 +45,9 @@ type NetworkConfig struct {
 	LLDPTxTLVs              []string    `json:"lldp_tx_tlvs,omitempty" one_of:"chassis,port,system,vlan" default:"chassis,port,system,vlan"`
 	MDNSMode                null.String `json:"mdns_mode,omitempty" one_of:"disabled,auto,ipv4_only,ipv6_only" default:"auto"`
 	TimeSyncMode            null.String `json:"time_sync_mode,omitempty" one_of:"ntp_only,ntp_and_http,http_only,custom" default:"ntp_and_http"`
-	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,http_user_provided" default:"ntp,http"`
+	TimeSyncOrdering        []string    `json:"time_sync_ordering,omitempty" one_of:"http,ntp,ntp_dhcp,ntp_user_provided,ntp_fallback" default:"ntp,http"`
 	TimeSyncDisableFallback null.Bool   `json:"time_sync_disable_fallback,omitempty" default:"false"`
 	TimeSyncParallel        null.Int    `json:"time_sync_parallel,omitempty" default:"4"`
-	TimeSyncNTPServers      []string    `json:"time_sync_ntp_servers,omitempty" validate_type:"ipv4_or_ipv6" required_if:"TimeSyncOrdering=ntp_user_provided"`
-	TimeSyncHTTPUrls        []string    `json:"time_sync_http_urls,omitempty" validate_type:"url" required_if:"TimeSyncOrdering=http_user_provided"`
 }
 
 func (c *NetworkConfig) GetMDNSMode() *mdns.MDNSListenOptions {

internal/network/netif.go

@@ -21,7 +21,6 @@ type NetworkInterfaceState struct {
 	ipv6Addr      *net.IP
 	ipv6Addresses []IPv6Address
 	ipv6LinkLocal *net.IP
-	ntpAddresses  []*net.IP
 	macAddr       *net.HardwareAddr
 
 	l         *zerolog.Logger
@@ -77,7 +76,6 @@ func NewNetworkInterfaceState(opts *NetworkInterfaceOptions) (*NetworkInterfaceS
 		onInitialCheck:  opts.OnInitialCheck,
 		cbConfigChange:  opts.OnConfigChange,
 		config:          opts.NetworkConfig,
-		ntpAddresses:    make([]*net.IP, 0),
 	}
 
 	// create the dhcp client
@@ -91,7 +89,7 @@ func NewNetworkInterfaceState(opts *NetworkInterfaceOptions) (*NetworkInterfaceS
 				opts.Logger.Error().Err(err).Msg("failed to update network state")
 				return
 			}
-			_ = s.updateNtpServersFromLease(lease)
+
 			_ = s.setHostnameIfNotSame()
 
 			opts.OnDhcpLeaseChange(lease)
@@ -137,27 +135,6 @@ func (s *NetworkInterfaceState) IPv6String() string {
 	return s.ipv6Addr.String()
 }
 
-func (s *NetworkInterfaceState) NtpAddresses() []*net.IP {
-	return s.ntpAddresses
-}
-
-func (s *NetworkInterfaceState) NtpAddressesString() []string {
-	ntpServers := []string{}
-
-	if s != nil {
-		s.l.Debug().Any("s", s).Msg("getting NTP address strings")
-
-		if len(s.ntpAddresses) > 0 {
-			for _, server := range s.ntpAddresses {
-				s.l.Debug().IPAddr("server", *server).Msg("converting NTP address")
-				ntpServers = append(ntpServers, server.String())
-			}
-		}
-	}
-
-	return ntpServers
-}
-
 func (s *NetworkInterfaceState) MAC() *net.HardwareAddr {
 	return s.macAddr
 }
@@ -341,25 +318,6 @@ func (s *NetworkInterfaceState) update() (DhcpTargetState, error) {
 	return dhcpTargetState, nil
 }
 
-func (s *NetworkInterfaceState) updateNtpServersFromLease(lease *udhcpc.Lease) error {
-	if lease != nil && len(lease.NTPServers) > 0 {
-		s.l.Info().Msg("lease found, updating DHCP NTP addresses")
-		s.ntpAddresses = make([]*net.IP, 0, len(lease.NTPServers))
-
-		for _, ntpServer := range lease.NTPServers {
-			if ntpServer != nil {
-				s.l.Info().IPAddr("ntp_server", ntpServer).Msg("NTP server found in lease")
-				s.ntpAddresses = append(s.ntpAddresses, &ntpServer)
-			}
-		}
-	} else {
-		s.l.Info().Msg("no NTP servers found in lease")
-		s.ntpAddresses = make([]*net.IP, 0, len(s.config.TimeSyncNTPServers))
-	}
-
-	return nil
-}
-
 func (s *NetworkInterfaceState) CheckAndUpdateDhcp() error {
 	dhcpTargetState, err := s.update()
 	if err != nil {

internal/timesync/http.go

@@ -19,9 +19,9 @@ var defaultHTTPUrls = []string{
 	// "http://www.msftconnecttest.com/connecttest.txt",
 }
 
-func (t *TimeSync) queryAllHttpTime(httpUrls []string) (now *time.Time) {
-	chunkSize := int(t.networkConfig.TimeSyncParallel.ValueOr(4))
-	t.l.Info().Strs("httpUrls", httpUrls).Int("chunkSize", chunkSize).Msg("querying HTTP URLs")
+func (t *TimeSync) queryAllHttpTime() (now *time.Time) {
+	chunkSize := 4
+	httpUrls := t.httpUrls
 
 	// shuffle the http urls to avoid always querying the same servers
 	rand.Shuffle(len(httpUrls), func(i, j int) { httpUrls[i], httpUrls[j] = httpUrls[j], httpUrls[i] })

internal/timesync/metrics.go

@@ -73,7 +73,6 @@ var (
 		},
 		[]string{"url"},
 	)
-
 	metricNtpServerInfo = promauto.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "jetkvm_timesync_ntp_server_info",

internal/timesync/ntp.go

@@ -1,7 +1,6 @@
 package timesync
 
 import (
-	"context"
 	"math/rand/v2"
 	"strconv"
 	"time"
@@ -22,9 +21,9 @@ var defaultNTPServers = []string{
 	"3.pool.ntp.org",
 }
 
-func (t *TimeSync) queryNetworkTime(ntpServers []string) (now *time.Time, offset *time.Duration) {
-	chunkSize := int(t.networkConfig.TimeSyncParallel.ValueOr(4))
-	t.l.Info().Strs("servers", ntpServers).Int("chunkSize", chunkSize).Msg("querying NTP servers")
+func (t *TimeSync) queryNetworkTime() (now *time.Time, offset *time.Duration) {
+	chunkSize := 4
+	ntpServers := t.ntpServers
 
 	// shuffle the ntp servers to avoid always querying the same servers
 	rand.Shuffle(len(ntpServers), func(i, j int) { ntpServers[i], ntpServers[j] = ntpServers[j], ntpServers[i] })
@@ -47,10 +46,6 @@ type ntpResult struct {
 
 func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (now *time.Time, offset *time.Duration) {
 	results := make(chan *ntpResult, len(servers))
-
-	_, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
 	for _, server := range servers {
 		go func(server string) {
 			scopedLogger := t.l.With().
@@ -71,25 +66,15 @@ func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (no
 				return
 			}
 
-			if response.IsKissOfDeath() {
-				scopedLogger.Warn().
-					Str("kiss_code", response.KissCode).
-					Msg("ignoring NTP server kiss of death")
-				results <- nil
-				return
-			}
-
-			rtt := float64(response.RTT.Milliseconds())
-
 			// set the last RTT
 			metricNtpServerLastRTT.WithLabelValues(
 				server,
-			).Set(rtt)
+			).Set(float64(response.RTT.Milliseconds()))
 
 			// set the RTT histogram
 			metricNtpServerRttHistogram.WithLabelValues(
 				server,
-			).Observe(rtt)
+			).Observe(float64(response.RTT.Milliseconds()))
 
 			// set the server info
 			metricNtpServerInfo.WithLabelValues(
@@ -106,13 +91,10 @@ func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (no
 			scopedLogger.Info().
 				Str("time", now.Format(time.RFC3339)).
 				Str("reference", response.ReferenceString()).
-				Float64("rtt", rtt).
+				Str("rtt", response.RTT.String()).
 				Str("clockOffset", response.ClockOffset.String()).
 				Uint8("stratum", response.Stratum).
 				Msg("NTP server returned time")
-
-			cancel()
-
 			results <- &ntpResult{
 				now:    now,
 				offset: &response.ClockOffset,

internal/timesync/timesync.go

@@ -28,8 +28,9 @@ type TimeSync struct {
 	syncLock *sync.Mutex
 	l        *zerolog.Logger
 
+	ntpServers    []string
+	httpUrls      []string
 	networkConfig *network.NetworkConfig
-	dhcpNtpAddresses []string
 
 	rtcDevicePath string
 	rtcDevice     *os.File //nolint:unused
@@ -65,10 +66,11 @@ func NewTimeSync(opts *TimeSyncOptions) *TimeSync {
 	t := &TimeSync{
 		syncLock:      &sync.Mutex{},
 		l:             opts.Logger,
-		dhcpNtpAddresses: []string{},
 		rtcDevicePath: rtcDevice,
 		rtcLock:       &sync.Mutex{},
 		preCheckFunc:  opts.PreCheckFunc,
+		ntpServers:    defaultNTPServers,
+		httpUrls:      defaultHTTPUrls,
 		networkConfig: opts.NetworkConfig,
 	}
 
@@ -80,42 +82,34 @@ func NewTimeSync(opts *TimeSyncOptions) *TimeSync {
 	return t
 }
 
-func (t *TimeSync) SetDhcpNtpAddresses(addresses []string) {
-	t.dhcpNtpAddresses = addresses
-}
-
 func (t *TimeSync) getSyncMode() SyncMode {
 	syncMode := SyncMode{
-		Ntp:             true,
-		Http:            true,
-		Ordering:        []string{"ntp_dhcp", "ntp", "http"},
 		NtpUseFallback:  true,
 		HttpUseFallback: true,
 	}
+	var syncModeString string
 
 	if t.networkConfig != nil {
-		switch t.networkConfig.TimeSyncMode.String {
-		case "ntp_only":
-			syncMode.Http = false
-		case "http_only":
-			syncMode.Ntp = false
-		}
-
+		syncModeString = t.networkConfig.TimeSyncMode.String
 		if t.networkConfig.TimeSyncDisableFallback.Bool {
 			syncMode.NtpUseFallback = false
 			syncMode.HttpUseFallback = false
 		}
-
-		var syncOrdering = t.networkConfig.TimeSyncOrdering
-		if len(syncOrdering) > 0 {
-			syncMode.Ordering = syncOrdering
-		}
 	}
 
-	t.l.Debug().Strs("Ordering", syncMode.Ordering).Bool("Ntp", syncMode.Ntp).Bool("Http", syncMode.Http).Bool("NtpUseFallback", syncMode.NtpUseFallback).Bool("HttpUseFallback", syncMode.HttpUseFallback).Msg("sync mode")
+	switch syncModeString {
+	case "ntp_only":
+		syncMode.Ntp = true
+	case "http_only":
+		syncMode.Http = true
+	default:
+		syncMode.Ntp = true
+		syncMode.Http = true
+	}
 
 	return syncMode
 }
+
 func (t *TimeSync) doTimeSync() {
 	metricTimeSyncStatus.Set(0)
 	for {
@@ -160,61 +154,16 @@ func (t *TimeSync) Sync() error {
 		offset *time.Duration
 	)
 
-	metricTimeSyncCount.Inc()
-
 	syncMode := t.getSyncMode()
 
-Orders:
-	for _, mode := range syncMode.Ordering {
-		switch mode {
-		case "ntp_user_provided":
+	metricTimeSyncCount.Inc()
+
 	if syncMode.Ntp {
-				t.l.Info().Msg("using NTP custom servers")
-				now, offset = t.queryNetworkTime(t.networkConfig.TimeSyncNTPServers)
-				if now != nil {
-					t.l.Info().Str("source", "NTP").Time("now", *now).Msg("time obtained")
-					break Orders
-				}
-			}
-		case "ntp_dhcp":
-			if syncMode.Ntp {
-				t.l.Info().Msg("using NTP servers from DHCP")
-				now, offset = t.queryNetworkTime(t.dhcpNtpAddresses)
-				if now != nil {
-					t.l.Info().Str("source", "NTP DHCP").Time("now", *now).Msg("time obtained")
-					break Orders
-				}
-			}
-		case "ntp":
-			if syncMode.Ntp && syncMode.NtpUseFallback {
-				t.l.Info().Msg("using NTP fallback")
-				now, offset = t.queryNetworkTime(defaultNTPServers)
-				if now != nil {
-					t.l.Info().Str("source", "NTP fallback").Time("now", *now).Msg("time obtained")
-					break Orders
-				}
-			}
-		case "http_user_provided":
-			if syncMode.Http {
-				t.l.Info().Msg("using HTTP custom URLs")
-				now = t.queryAllHttpTime(t.networkConfig.TimeSyncHTTPUrls)
-				if now != nil {
-					t.l.Info().Str("source", "HTTP").Time("now", *now).Msg("time obtained")
-					break Orders
-				}
-			}
-		case "http":
-			if syncMode.Http && syncMode.HttpUseFallback {
-				t.l.Info().Msg("using HTTP fallback")
-				now = t.queryAllHttpTime(defaultHTTPUrls)
-				if now != nil {
-					t.l.Info().Str("source", "HTTP fallback").Time("now", *now).Msg("time obtained")
-					break Orders
-				}
-			}
-		default:
-			t.l.Warn().Str("mode", mode).Msg("unknown time sync mode, skipping")
+		now, offset = t.queryNetworkTime()
 	}
+
+	if syncMode.Http && now == nil {
+		now = t.queryAllHttpTime()
 	}
 
 	if now == nil {

internal/usbgadget/config.go

@@ -30,8 +30,8 @@ var defaultGadgetConfig = map[string]gadgetConfigItem{
 		attrs: gadgetAttributes{
 			"bcdUSB":    "0x0200", // USB 2.0
 			"idVendor":  "0x1d6b", // The Linux Foundation
-			"idProduct": "0x0104", // Multifunction Composite Gadget
-			"bcdDevice": "0x0100", // USB2
+			"idProduct": "0104",   // Multifunction Composite Gadget
+			"bcdDevice": "0100",
 		},
 		configAttrs: gadgetAttributes{
 			"MaxPower": "250", // in unit of 2mA

jsonrpc.go

@@ -685,7 +685,6 @@ type DCPowerState struct {
 	Voltage float64 `json:"voltage"`
 	Current float64 `json:"current"`
 	Power   float64 `json:"power"`
-	RestoreState int     `json:"restoreState"`
 }
 
 func rpcGetDCPowerState() (DCPowerState, error) {
@@ -701,15 +700,6 @@ func rpcSetDCPowerState(enabled bool) error {
 	return nil
 }
 
-func rpcSetDCRestoreState(state int) error {
-	logger.Info().Int("state", state).Msg("Setting DC restore state")
-	err := setDCRestoreState(state)
-	if err != nil {
-		return fmt.Errorf("failed to set DC restore state: %w", err)
-	}
-	return nil
-}
-
 func rpcGetActiveExtension() (string, error) {
 	return config.ActiveExtension, nil
 }
@@ -1098,7 +1088,6 @@ var rpcHandlers = map[string]RPCHandler{
 	"getBacklightSettings":   {Func: rpcGetBacklightSettings},
 	"getDCPowerState":        {Func: rpcGetDCPowerState},
 	"setDCPowerState":        {Func: rpcSetDCPowerState, Params: []string{"enabled"}},
-	"setDCRestoreState":      {Func: rpcSetDCRestoreState, Params: []string{"state"}},
 	"getActiveExtension":     {Func: rpcGetActiveExtension},
 	"setActiveExtension":     {Func: rpcSetActiveExtension, Params: []string{"extensionId"}},
 	"getATXState":            {Func: rpcGetATXState},

network.go

@@ -19,14 +19,6 @@ func networkStateChanged() {
 	// do not block the main thread
 	go waitCtrlAndRequestDisplayUpdate(true)
 
-	if timeSync != nil {
-		if networkState != nil {
-			timeSync.SetDhcpNtpAddresses(networkState.NtpAddressesString())
-		}
-
-		timeSync.Sync()
-	}
-
 	// always restart mDNS when the network state changes
 	if mDNS != nil {
 		_ = mDNS.SetListenOptions(config.NetworkConfig.GetMDNSMode())

serial.go

@@ -142,7 +142,6 @@ var dcState DCPowerState
 func runDCControl() {
 	scopedLogger := serialLogger.With().Str("service", "dc_control").Logger()
 	reader := bufio.NewReader(port)
-	hasRestoreFeature := false
 	for {
 		line, err := reader.ReadString('\n')
 		if err != nil {
@@ -152,13 +151,7 @@ func runDCControl() {
 
 		// Split the line by semicolon
 		parts := strings.Split(strings.TrimSpace(line), ";")
-		if len(parts) == 5 {
-			scopedLogger.Debug().Str("line", line).Msg("Detected DC extension with restore feature")
-			hasRestoreFeature = true
-		} else if len(parts) == 4 {
-			scopedLogger.Debug().Str("line", line).Msg("Detected DC extension without restore feature")
-			hasRestoreFeature = false
-		} else {
+		if len(parts) != 4 {
 			scopedLogger.Warn().Str("line", line).Msg("Invalid line")
 			continue
 		}
@@ -170,17 +163,6 @@ func runDCControl() {
 			continue
 		}
 		dcState.IsOn = powerState == 1
-		if hasRestoreFeature {
-			restoreState, err := strconv.Atoi(parts[4])
-			if err != nil {
-				scopedLogger.Warn().Err(err).Msg("Invalid restore state")
-				continue
-			}
-			dcState.RestoreState = restoreState
-		} else {
-			// -1 means not supported
-			dcState.RestoreState = -1
-		}
 		milliVolts, err := strconv.ParseFloat(parts[1], 64)
 		if err != nil {
 			scopedLogger.Warn().Err(err).Msg("Invalid voltage")
@@ -228,25 +210,6 @@ func setDCPowerState(on bool) error {
 	return nil
 }
 
-func setDCRestoreState(state int) error {
-	_, err := port.Write([]byte("\n"))
-	if err != nil {
-		return err
-	}
-	command := "RESTORE_MODE_OFF\n"
-	switch state {
-	case 1:
-		command = "RESTORE_MODE_ON\n"
-	case 2:
-		command = "RESTORE_MODE_LAST_STATE\n"
-	}
-	_, err = port.Write([]byte(command))
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 var defaultMode = &serial.Mode{
 	BaudRate: 115200,
 	DataBits: 8,

ui/package.json

@@ -19,21 +19,21 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@headlessui/react": "^2.2.4",
+    "@headlessui/react": "^2.2.3",
     "@headlessui/tailwindcss": "^0.2.2",
     "@heroicons/react": "^2.2.0",
-    "@vitejs/plugin-basic-ssl": "^2.1.0",
+    "@vitejs/plugin-basic-ssl": "^2.0.0",
     "@xterm/addon-clipboard": "^0.1.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/addon-unicode11": "^0.8.0",
     "@xterm/addon-web-links": "^0.11.0",
     "@xterm/addon-webgl": "^0.18.0",
     "@xterm/xterm": "^5.5.0",
-    "cva": "^1.0.0-beta.4",
+    "cva": "^1.0.0-beta.3",
     "dayjs": "^1.11.13",
     "eslint-import-resolver-alias": "^1.1.2",
-    "focus-trap-react": "^11.0.4",
-    "framer-motion": "^12.23.0",
+    "focus-trap-react": "^11.0.3",
+    "framer-motion": "^12.11.4",
     "lodash.throttle": "^4.1.1",
     "mini-svg-data-uri": "^1.4.4",
     "react": "^19.1.0",
@@ -42,42 +42,42 @@
     "react-hot-toast": "^2.5.2",
     "react-icons": "^5.5.0",
     "react-router-dom": "^7.6.3",
-    "react-simple-keyboard": "^3.8.89",
+    "react-simple-keyboard": "^3.8.72",
     "react-use-websocket": "^4.13.0",
     "react-xtermjs": "^1.0.10",
     "recharts": "^2.15.3",
-    "tailwind-merge": "^3.3.1",
+    "tailwind-merge": "^3.3.0",
     "usehooks-ts": "^3.1.1",
-    "validator": "^13.15.15",
+    "validator": "^13.15.0",
     "zustand": "^4.5.2"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.1",
+    "@eslint/compat": "^1.2.9",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.30.1",
+    "@eslint/js": "^9.26.0",
     "@tailwindcss/forms": "^0.5.10",
-    "@tailwindcss/postcss": "^4.1.11",
+    "@tailwindcss/postcss": "^4.1.7",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "^4.1.11",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
+    "@tailwindcss/vite": "^4.1.7",
+    "@types/react": "^19.1.4",
+    "@types/react-dom": "^19.1.5",
     "@types/semver": "^7.7.0",
-    "@types/validator": "^13.15.2",
-    "@typescript-eslint/eslint-plugin": "^8.35.1",
-    "@typescript-eslint/parser": "^8.35.1",
-    "@vitejs/plugin-react-swc": "^3.10.2",
+    "@types/validator": "^13.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/parser": "^8.32.1",
+    "@vitejs/plugin-react-swc": "^3.9.0",
     "autoprefixer": "^10.4.21",
-    "eslint": "^9.30.1",
+    "eslint": "^9.26.0",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^16.3.0",
-    "postcss": "^8.5.6",
-    "prettier": "^3.6.2",
-    "prettier-plugin-tailwindcss": "^0.6.13",
-    "tailwindcss": "^4.1.11",
+    "globals": "^16.1.0",
+    "postcss": "^8.5.3",
+    "prettier": "^3.5.3",
+    "prettier-plugin-tailwindcss": "^0.6.11",
+    "tailwindcss": "^4.1.7",
     "typescript": "^5.8.3",
     "vite": "^6.3.5",
     "vite-tsconfig-paths": "^5.1.4"

ui/src/components/WebRTCVideo.tsx

@@ -657,16 +657,6 @@ export default function WebRTCVideo() {
     return true;
   }, [isPlaying, isPointerLockActive, isPointerLockPossible, isVideoLoading, settings.mouseMode, videoHeight, videoWidth]);
 
-  // Conditionally set the filter style so we don't fallback to software rendering if these values are default of 1.0
-  const videoStyle = useMemo(() => {
-    const isDefault = videoSaturation === 1.0 && videoBrightness === 1.0 && videoContrast === 1.0;
-    return isDefault
-      ? {} // No filter if all settings are default (1.0)
-      : {
-          filter: `saturate(${videoSaturation}) brightness(${videoBrightness}) contrast(${videoContrast})`,
-        };
-  }, [videoSaturation, videoBrightness, videoContrast]);
-
   return (
     <div className="grid h-full w-full grid-rows-(--grid-layout)">
       <div className="flex min-h-[39.5px] flex-col">
@@ -701,15 +691,17 @@ export default function WebRTCVideo() {
                     <div className="relative flex h-full w-full items-center justify-center">
                         <video
                           ref={videoElm}
-                          autoPlay
+                          autoPlay={true}
                           controls={false}
                           onPlaying={onVideoPlaying}
                           onPlay={onVideoPlaying}
-                          muted
+                          muted={true}
                           playsInline
                           disablePictureInPicture
                           controlsList="nofullscreen"
-                          style={videoStyle}
+                          style={{
+                            filter: `saturate(${videoSaturation}) brightness(${videoBrightness}) contrast(${videoContrast})`,
+                          }}
                           className={cx(
                             "max-h-full min-h-[384px] max-w-full min-w-[512px] bg-black/50 object-contain transition-all duration-1000",
                             {

ui/src/components/extensions/DCPowerControl.tsx

@@ -8,14 +8,12 @@ import { useJsonRpc } from "@/hooks/useJsonRpc";
 import notifications from "@/notifications";
 import FieldLabel from "@components/FieldLabel";
 import LoadingSpinner from "@components/LoadingSpinner";
-import {SelectMenuBasic} from "@components/SelectMenuBasic";
 
 interface DCPowerState {
   isOn: boolean;
   voltage: number;
   current: number;
   power: number;
-  restoreState: number;
 }
 
 export function DCPowerControl() {
@@ -45,20 +43,6 @@ export function DCPowerControl() {
       getDCPowerState(); // Refresh state after change
     });
   };
-  const handleRestoreChange = (state: number) => {
-    // const state = powerState?.restoreState === 0 ? 1 : powerState?.restoreState === 1 ? 2 : 0;
-    send("setDCRestoreState", { state }, resp => {
-      if ("error" in resp) {
-        notifications.error(
-          `Failed to set DC power state: ${resp.error.data || "Unknown error"}`,
-        );
-        return;
-      }
-      getDCPowerState(); // Refresh state after change
-    });
-  };
-
-
 
   useEffect(() => {
     getDCPowerState();
@@ -79,7 +63,7 @@ export function DCPowerControl() {
           <LoadingSpinner className="h-6 w-6 text-blue-500 dark:text-blue-400" />
         </Card>
       ) : (
-        <Card className="animate-fadeIn opacity-0">
+        <Card className="h-[160px] animate-fadeIn opacity-0">
           <div className="space-y-4 p-3">
             {/* Power Controls */}
             <div className="flex items-center space-x-2">
@@ -100,21 +84,6 @@ export function DCPowerControl() {
                 onClick={() => handlePowerToggle(false)}
               />
             </div>
-            {powerState.restoreState > -1 ? (
-              <div className="flex items-center">
-                <SelectMenuBasic
-                    size="SM"
-                    label="Restore Power Loss"
-                    value={powerState.restoreState}
-                    onChange={e => handleRestoreChange(parseInt(e.target.value))}
-                    options={[
-                      { value: '0', label: "Power OFF" },
-                      { value: '1', label: "Power ON" },
-                      { value: '2', label: "Last State" },
-                    ]}
-                />
-              </div>
-            ) : null}
             <hr className="border-slate-700/30 dark:border-slate-600/30" />
 
             {/* Status Display */}

ui/src/main.tsx

@@ -42,7 +42,6 @@ import SettingsHardwareRoute from "./routes/devices.$id.settings.hardware";
 import SettingsVideoRoute from "./routes/devices.$id.settings.video";
 import SettingsAppearanceRoute from "./routes/devices.$id.settings.appearance";
 import * as SettingsGeneralIndexRoute from "./routes/devices.$id.settings.general._index";
-import SettingsGeneralRebootRoute from "./routes/devices.$id.settings.general.reboot";
 import SettingsGeneralUpdateRoute from "./routes/devices.$id.settings.general.update";
 import SettingsNetworkRoute from "./routes/devices.$id.settings.network";
 import SecurityAccessLocalAuthRoute from "./routes/devices.$id.settings.access.local-auth";
@@ -141,10 +140,6 @@ if (isOnDevice) {
                   index: true,
                   element: <SettingsGeneralIndexRoute.default />,
                 },
-                {
-                  path: "reboot",
-                  element: <SettingsGeneralRebootRoute />,
-                },
                 {
                   path: "update",
                   element: <SettingsGeneralUpdateRoute />,

ui/src/routes/devices.$id.settings.general._index.tsx

@@ -92,21 +92,6 @@ export default function SettingsGeneralRoute() {
               />
             </SettingsItem>
           </div>
-
-          <div className="mt-2 flex items-center justify-between gap-x-2">
-            <SettingsItem
-              title="Reboot Device"
-              description="Power cycle the JetKVM"
-            />
-            <div>
-              <Button
-                size="SM"
-                theme="light"
-                text="Reboot Device"
-                onClick={() => navigateTo("./reboot")}
-              />
-            </div>
-          </div>
         </div>
       </div>
     </div>

ui/src/routes/devices.$id.settings.general.reboot.tsx

@@ -1,66 +0,0 @@
-import { useNavigate } from "react-router-dom";
-import { useCallback } from "react";
-
-import { useJsonRpc } from "@/hooks/useJsonRpc";
-import { Button } from "@components/Button";
-
-export default function SettingsGeneralRebootRoute() {
-  const navigate = useNavigate();
-  const [send] = useJsonRpc();
-
-  const onConfirmUpdate = useCallback(() => {
-    // This is where we send the RPC to the golang binary
-    send("reboot", {force: true});
-  }, [send]);
-
-  {
-    /* TODO: Migrate to using URLs instead of the global state. To simplify the refactoring, we'll keep the global state for now. */
-  }
-  return <Dialog onClose={() => navigate("..")} onConfirmUpdate={onConfirmUpdate} />;
-}
-
-export function Dialog({
-  onClose,
-  onConfirmUpdate,
-}: {
-  onClose: () => void;
-  onConfirmUpdate: () => void;
-}) {
-
-  return (
-    <div className="pointer-events-auto relative mx-auto text-left">
-      <div>
-          <ConfirmationBox
-            onYes={onConfirmUpdate}
-            onNo={onClose}
-          />
-      </div>
-    </div>
-  );
-}
-
-function ConfirmationBox({
-  onYes,
-  onNo,
-}: {
-  onYes: () => void;
-  onNo: () => void;
-}) {
-  return (
-    <div className="flex flex-col items-start justify-start space-y-4 text-left">
-      <div className="text-left">
-        <p className="text-base font-semibold text-black dark:text-white">
-          Reboot JetKVM
-        </p>
-        <p className="text-sm text-slate-600 dark:text-slate-300">
-          Do you want to proceed with rebooting the system?
-        </p>
-
-        <div className="mt-4 flex gap-x-2">
-          <Button size="SM" theme="light" text="Yes" onClick={onYes} />
-          <Button size="SM" theme="blank" text="No" onClick={onNo} />
-        </div>
-      </div>
-    </div>
-  );
-}

web.go

@@ -97,6 +97,9 @@ func setupRouter() *gin.Engine {
 	// We use this to determine if the device is setup
 	r.GET("/device/status", handleDeviceStatus)
 
+	// We use this to provide the UI with the device configuration
+	r.GET("/device/ui-config.js", handleDeviceUIConfig)
+
 	// We use this to setup the device in the welcome page
 	r.POST("/device/setup", handleSetup)
 
@@ -691,6 +694,21 @@ func handleCloudState(c *gin.Context) {
 	c.JSON(http.StatusOK, response)
 }
 
+func handleDeviceUIConfig(c *gin.Context) {
+	config, _ := json.Marshal(gin.H{
+		"CLOUD_API":      config.CloudURL,
+		"DEVICE_VERSION": builtAppVersion,
+	})
+	if config == nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to marshal config"})
+		return
+	}
+
+	response := fmt.Sprintf("window.JETKVM_CONFIG = %s;", config)
+
+	c.Data(http.StatusOK, "text/javascript; charset=utf-8", []byte(response))
+}
+
 func handleSetup(c *gin.Context) {
 	// Check if the device is already set up
 	if config.LocalAuthMode != "" || config.HashedPassword != "" {