OTA refactor

.vscode/settings.json

@@ -11,5 +11,13 @@
   },
   "git.ignoreLimitWarning": true,
   "cmake.sourceDirectory": "/workspaces/kvm-static-ip/internal/native/cgo",
-  "cmake.ignoreCMakeListsMissing": true
+  "cmake.ignoreCMakeListsMissing": true,
+  "json.schemas": [
+    {
+      "fileMatch": [
+        "/internal/ota/testdata/ota/*.json"
+      ],
+      "url": "./internal/ota/testdata/ota.schema.json"
+    }
+  ]
 }

config.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/jetkvm/kvm/internal/confparser"
@@ -15,6 +16,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
+const (
+	DefaultAPIURL = "https://api.jetkvm.com"
+)
+
 type WakeOnLanDevice struct {
 	Name       string `json:"name"`
 	MacAddress string `json:"macAddress"`
@@ -80,6 +85,7 @@ func (m *KeyboardMacro) Validate() error {
 
 type Config struct {
 	CloudURL             string               `json:"cloud_url"`
+	UpdateAPIURL         string               `json:"update_api_url"`
 	CloudAppURL          string               `json:"cloud_app_url"`
 	CloudToken           string               `json:"cloud_token"`
 	GoogleIdentity       string               `json:"google_identity"`
@@ -109,6 +115,15 @@ type Config struct {
 	VideoQualityFactor   float64              `json:"video_quality_factor"`
 }
 
+// GetUpdateAPIURL returns the update API URL
+func (c *Config) GetUpdateAPIURL() string {
+	if c.UpdateAPIURL == "" {
+		return DefaultAPIURL
+	}
+	return strings.TrimSuffix(c.UpdateAPIURL, "/") + "/releases"
+}
+
+// GetDisplayRotation returns the display rotation
 func (c *Config) GetDisplayRotation() uint16 {
 	rotationInt, err := strconv.ParseUint(c.DisplayRotation, 10, 16)
 	if err != nil {
@@ -118,6 +133,7 @@ func (c *Config) GetDisplayRotation() uint16 {
 	return uint16(rotationInt)
 }
 
+// SetDisplayRotation sets the display rotation
 func (c *Config) SetDisplayRotation(rotation string) error {
 	_, err := strconv.ParseUint(rotation, 10, 16)
 	if err != nil {
@@ -156,7 +172,8 @@ var (
 
 func getDefaultConfig() Config {
 	return Config{
-		CloudURL:             "https://api.jetkvm.com",
+		CloudURL:             DefaultAPIURL,
+		UpdateAPIURL:         DefaultAPIURL,
 		CloudAppURL:          "https://app.jetkvm.com",
 		AutoUpdateEnabled:    true, // Set a default value
 		ActiveExtension:      "",

hw.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/jetkvm/kvm/internal/ota"
 )
 
 func extractSerialNumber() (string, error) {
@@ -29,22 +31,16 @@ func extractSerialNumber() (string, error) {
 	return matches[1], nil
 }
 
-func readOtpEntropy() ([]byte, error) { //nolint:unused
-	content, err := os.ReadFile("/sys/bus/nvmem/devices/rockchip-otp0/nvmem")
-	if err != nil {
-		return nil, err
-	}
-	return content[0x17:0x1C], nil
-}
-
-func hwReboot(force bool, postRebootAction *PostRebootAction, delay time.Duration) error {
-	logger.Info().Msgf("Reboot requested, rebooting in %d seconds...", delay)
+func hwReboot(force bool, postRebootAction *ota.PostRebootAction, delay time.Duration) error {
+	logger.Info().Dur("delayMs", delay).Msg("reboot requested")
 
 	writeJSONRPCEvent("willReboot", postRebootAction, currentSession)
 	time.Sleep(1 * time.Second) // Wait for the JSONRPCEvent to be sent
 
 	nativeInstance.SwitchToScreenIfDifferent("rebooting_screen")
-	time.Sleep(delay - (1 * time.Second)) // wait requested extra settle time
+	if delay > 1*time.Second {
+		time.Sleep(delay - 1*time.Second) // wait requested extra settle time
+	}
 
 	args := []string{}
 	if force {

internal/ota/app.go

@@ -0,0 +1,45 @@
+package ota
+
+import (
+	"context"
+	"time"
+)
+
+const (
+	appUpdatePath = "/userdata/jetkvm/jetkvm_app.update"
+)
+
+// DO NOT call it directly, it's not thread safe
+// Mutex is currently held by the caller, e.g. doUpdate
+func (s *State) updateApp(ctx context.Context, appUpdate *componentUpdateStatus) error {
+	l := s.l.With().Str("path", appUpdatePath).Logger()
+
+	if err := s.downloadFile(ctx, appUpdatePath, appUpdate.url, "app"); err != nil {
+		return s.componentUpdateError("Error downloading app update", err, &l)
+	}
+
+	downloadFinished := time.Now()
+	appUpdate.downloadFinishedAt = downloadFinished
+	appUpdate.downloadProgress = 1
+	s.triggerComponentUpdateState("app", appUpdate)
+
+	if err := s.verifyFile(
+		appUpdatePath,
+		appUpdate.hash,
+		&appUpdate.verificationProgress,
+	); err != nil {
+		return s.componentUpdateError("Error verifying app update hash", err, &l)
+	}
+	verifyFinished := time.Now()
+	appUpdate.verifiedAt = verifyFinished
+	appUpdate.verificationProgress = 1
+	appUpdate.updatedAt = verifyFinished
+	appUpdate.updateProgress = 1
+	s.triggerComponentUpdateState("app", appUpdate)
+
+	l.Info().Msg("App update downloaded")
+
+	s.rebootNeeded = true
+
+	return nil
+}

internal/ota/errors.go

@@ -0,0 +1,24 @@
+package ota
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/rs/zerolog"
+)
+
+var (
+	// ErrVersionNotFound is returned when the specified version is not found
+	ErrVersionNotFound = errors.New("specified version not found")
+)
+
+func (s *State) componentUpdateError(prefix string, err error, l *zerolog.Logger) error {
+	if l == nil {
+		l = s.l
+	}
+	l.Error().Err(err).Msg(prefix)
+	s.error = fmt.Sprintf("%s: %v", prefix, err)
+	s.updating = false
+	s.triggerStateUpdate()
+	return err
+}