Update App version to 0.0.2

Author: luckfox-eng29

.gitignore

@@ -3,5 +3,9 @@ static/*
 .idea
 .DS_Store
 .vscode
+package-lock.json
+package.json
+node_modules/
 
-device-tests.tar.gz
+
+device-tests.tar.gz

.golangci.yml

@@ -5,6 +5,8 @@ linters:
     - misspell
     - whitespace
     - gochecknoinits
+  disable:
+    - unused
   settings:
     forbidigo:
       forbid:

.vscode/settings.json

@@ -2,8 +2,8 @@ BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
 BUILDDATE ?= $(shell date -u +%FT%T%z)
 BUILDTS   ?= $(shell date -u +%s)
 REVISION  ?= $(shell git rev-parse HEAD)
-VERSION_DEV ?= 0.0.1-dev
-VERSION ?= 0.0.1
+VERSION_DEV ?= 0.0.2-dev
+VERSION ?= 0.0.2
 
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := kvm

Makefile

@@ -99,7 +99,10 @@ func StartNtpAudioServer(handleClient func(net.Conn)) {
 }
 
 func StopNtpAudioServer() {
-	CallAudioCtrlAction("set_audio_enable", map[string]interface{}{"audio_enable": false})
+	_, err := CallAudioCtrlAction("set_audio_enable", map[string]interface{}{"audio_enable": false})
+	if err != nil {
+		audioLogger.Error().Err(err).Msg("failed to set audio enable")
+	}
 
 	if audioListener != nil {
 		audioListener.Close()
@@ -138,7 +141,7 @@ func handleAudioClient(conn net.Conn) {
 			}
 
 			timestamp += timestampStep
-			packet.Header.Timestamp = timestamp
+			packet.Timestamp = timestamp
 			buf, err := packet.Marshal()
 			if err != nil {
 				audioLogger.Warn().Err(err).Msg("error marshalling packet")

audio.go

@@ -118,8 +118,7 @@ func handleSessionRequest(
 	source string,
 	scopedLogger *zerolog.Logger,
 ) error {
-	var sourceType string
-	sourceType = "local"
+	var sourceType = "local"
 
 	timer := prometheus.NewTimer(prometheus.ObserverFunc(func(v float64) {
 		metricConnectionLastSessionRequestDuration.WithLabelValues(sourceType, source).Set(v)

cloud.go

@@ -1,9 +1,14 @@
 package kvm
 
 import (
+	"bufio"
 	"encoding/json"
 	"fmt"
+	"io"
 	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
 	"sync"
 
 	"kvm/internal/logging"
@@ -75,8 +80,7 @@ func (m *KeyboardMacro) Validate() error {
 }
 
 type Config struct {
-	CloudToken           string                 `json:"cloud_token"`
-	GoogleIdentity       string                 `json:"google_identity"`
+	STUN                 string                 `json:"stun"`
 	JigglerEnabled       bool                   `json:"jiggler_enabled"`
 	AutoUpdateEnabled    bool                   `json:"auto_update_enabled"`
 	IncludePreRelease    bool                   `json:"include_pre_release"`
@@ -102,6 +106,8 @@ type Config struct {
 	TailScaleXEdge       bool                   `json:"tailscale_xedge"`
 	ZeroTierNetworkID    string                 `json:"zerotier_network_id"`
 	ZeroTierAutoStart    bool                   `json:"zerotier_autostart"`
+	FrpcAutoStart        bool                   `json:"frpc_autostart"`
+	FrpcToml             string                 `json:"frpc_toml"`
 	IO0Status            bool                   `json:"io0_status"`
 	IO1Status            bool                   `json:"io1_status"`
 	AudioMode            string                 `json:"audio_mode"`
@@ -111,8 +117,10 @@ type Config struct {
 }
 
 const configPath = "/userdata/kvm_config.json"
+const sdConfigPath = "/mnt/sdcard/kvm_config.json"
 
 var defaultConfig = &Config{
+	STUN:                 "stun:stun.l.google.com:19302",
 	AutoUpdateEnabled:    false, // Set a default value
 	ActiveExtension:      "",
 	KeyboardMacros:       []KeyboardMacro{},
@@ -135,13 +143,15 @@ var defaultConfig = &Config{
 		RelativeMouse: true,
 		Keyboard:      true,
 		MassStorage:   true,
-		Audio:         true,
+		Audio:         false, //At any given time, only one of Audio and Mtp can be set to true
+		Mtp:           false,
 	},
 	NetworkConfig:      &network.NetworkConfig{},
 	DefaultLogLevel:    "INFO",
 	ZeroTierAutoStart:  false,
 	TailScaleAutoStart: false,
 	TailScaleXEdge:     false,
+	FrpcAutoStart:      false,
 	IO0Status:          true,
 	IO1Status:          true,
 	AudioMode:          "disabled",
@@ -165,6 +175,14 @@ func LoadConfig() {
 
 	// load the default config
 	config = defaultConfig
+	if config.UsbConfig.SerialNumber == "" {
+		serialNumber, err := extractSerialNumber()
+		if err != nil {
+			logger.Warn().Err(err).Msg("failed to extract serial number")
+		} else {
+			config.UsbConfig.SerialNumber = serialNumber
+		}
+	}
 
 	file, err := os.Open(configPath)
 	if err != nil {
@@ -177,6 +195,10 @@ func LoadConfig() {
 	loadedConfig := *defaultConfig
 	if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil {
 		logger.Warn().Err(err).Msg("config file JSON parsing failed")
+		os.Remove(configPath)
+		if _, err := os.Stat(sdConfigPath); err == nil {
+			os.Remove(sdConfigPath)
+		}
 		return
 	}
 
@@ -200,6 +222,74 @@ func LoadConfig() {
 	logger.Info().Str("path", configPath).Msg("config loaded")
 }
 
+func copyFile(src, dst string) error {
+	in, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer in.Close()
+
+	if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
+		return err
+	}
+
+	out, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if cerr := out.Close(); cerr != nil && err == nil {
+			err = cerr
+		}
+	}()
+
+	if _, err := io.Copy(out, in); err != nil {
+		return err
+	}
+
+	if err := out.Sync(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func SyncConfigSD(isUpdate bool) {
+	resp, err := rpcGetSDMountStatus()
+	if err != nil {
+		logger.Error().Err(err).Msg("failed to get sd mount status")
+		return
+	}
+
+	if resp.Status == SDMountOK {
+		if _, err := os.Stat(configPath); err != nil {
+			if err := SaveConfig(); err != nil {
+				logger.Error().Err(err).Msg("failed to create kvm_config.json")
+				return
+			}
+		}
+
+		if isUpdate {
+			if _, err := os.Stat(sdConfigPath); err == nil {
+				if err := copyFile(sdConfigPath, configPath); err != nil {
+					logger.Error().Err(err).Msg("failed to copy kvm_config.json from sdcard to userdata")
+					return
+				}
+			} else {
+				if err := copyFile(configPath, sdConfigPath); err != nil {
+					logger.Error().Err(err).Msg("failed to copy kvm_config.json from userdata to sdcard")
+					return
+				}
+			}
+		} else {
+			if err := copyFile(configPath, sdConfigPath); err != nil {
+				logger.Error().Err(err).Msg("failed to copy kvm_config.json from userdata to sdcard")
+				return
+			}
+		}
+	}
+}
+
 func SaveConfig() error {
 	configLock.Lock()
 	defer configLock.Unlock()
@@ -218,6 +308,8 @@ func SaveConfig() error {
 		return fmt.Errorf("failed to encode config: %w", err)
 	}
 
+	SyncConfigSD(false)
+
 	return nil
 }
 
@@ -226,3 +318,95 @@ func ensureConfigLoaded() {
 		LoadConfig()
 	}
 }
+
+var systemInfoWriteLock sync.Mutex
+
+func writeSystemInfoImg() error {
+	systemInfoWriteLock.Lock()
+	defer systemInfoWriteLock.Unlock()
+
+	imgPath := filepath.Join(imagesFolder, "system_info.img")
+	unverifiedimgPath := filepath.Join(imagesFolder, "system_info.img") + ".unverified"
+	mountPoint := "/mnt/system_info"
+
+	run := func(cmd string, args ...string) error {
+		c := exec.Command(cmd, args...)
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		return c.Run()
+	}
+
+	if _, err := os.Stat(unverifiedimgPath); err == nil {
+		err := os.Rename(unverifiedimgPath, imgPath)
+		if err != nil {
+			return fmt.Errorf("failed to rename %s to %s: %v", unverifiedimgPath, imgPath, err)
+		}
+		return nil
+	}
+
+	isMounted := false
+	if f, err := os.Open("/proc/mounts"); err == nil {
+		defer f.Close()
+		scanner := bufio.NewScanner(f)
+		for scanner.Scan() {
+			fields := strings.Fields(scanner.Text())
+			if len(fields) >= 2 && fields[1] == mountPoint {
+				isMounted = true
+				break
+			}
+		}
+	}
+
+	if isMounted {
+		logger.Info().Msgf("%s is mounted, umounting...\n", mountPoint)
+		_ = run("umount", mountPoint)
+	}
+
+	if _, err := os.Stat(mountPoint); err == nil {
+		if err := os.Remove(mountPoint); err != nil {
+			return fmt.Errorf("failed to remove %s: %v", mountPoint, err)
+		}
+	}
+
+	if _, err := os.Stat(imgPath); err == nil {
+		if err := copyFile(imgPath, unverifiedimgPath); err != nil {
+			logger.Error().Err(err).Msg("failed to copy system_info.img")
+			return err
+		}
+	} else {
+		if err := run("dd", "if=/dev/zero", "of="+unverifiedimgPath, "bs=1M", "count=4"); err != nil {
+			return fmt.Errorf("dd failed: %v", err)
+		}
+
+		if err := run("mkfs.vfat", unverifiedimgPath); err != nil {
+			return fmt.Errorf("mkfs.vfat failed: %v", err)
+		}
+	}
+
+	if err := os.MkdirAll(mountPoint, 0755); err != nil {
+		return fmt.Errorf("mkdir failed: %v", err)
+	}
+
+	if err := run("mount", "-o", "loop", unverifiedimgPath, mountPoint); err != nil {
+		return fmt.Errorf("mount failed: %v", err)
+	}
+
+	if err := run("cp", "/etc/hostname", mountPoint+"/hostname.txt"); err != nil {
+		return fmt.Errorf("copy hostname failed: %v", err)
+	}
+	if err := run("sh", "-c", "ip addr show > "+mountPoint+"/network_info.txt"); err != nil {
+		return fmt.Errorf("write network info failed: %v", err)
+	}
+
+	_ = run("umount", mountPoint)
+	if err := os.RemoveAll(mountPoint); err != nil {
+		return fmt.Errorf("failed to remove %s: %v", mountPoint, err)
+	}
+
+	if err := os.Rename(unverifiedimgPath, imgPath); err != nil {
+		return fmt.Errorf("failed to rename %s to %s: %v", unverifiedimgPath, imgPath, err)
+	}
+
+	logger.Info().Msg("system_info.img update successfully")
+	return nil
+}

config.go

@@ -109,18 +109,21 @@ func updateDisplay() {
 	} else {
 		_, _ = lvObjSetState("Main", "USB_DISCONNECTED")
 	}
+	_ = os.WriteFile("/userdata/usb_state", []byte(usbState), 0644)
+
 	if lastVideoState.Ready {
 		_, _ = lvObjSetState("Main", "HDMI_CONNECTED")
+		_ = os.WriteFile("/userdata/hdmi_state", []byte("connected"), 0644)
 	} else {
 		_, _ = lvObjSetState("Main", "HDMI_DISCONNECTED")
+		_ = os.WriteFile("/userdata/hdmi_state", []byte("disconnected"), 0644)
 	}
 
 	if networkState.IsUp() {
 		_, _ = lvObjSetState("Network", "NETWORK")
 	} else {
 		_, _ = lvObjSetState("Network", "NO_NETWORK")
 	}
-
 }
 
 var (

display.go

@@ -36,8 +36,9 @@ type NetworkConfig struct {
 	Hostname null.String `json:"hostname,omitempty" validate_type:"hostname"`
 	Domain   null.String `json:"domain,omitempty" validate_type:"hostname"`
 
-	IPv4Mode   null.String       `json:"ipv4_mode,omitempty" one_of:"dhcp,static,disabled" default:"dhcp"`
-	IPv4Static *IPv4StaticConfig `json:"ipv4_static,omitempty" required_if:"IPv4Mode=static"`
+	IPv4Mode           null.String       `json:"ipv4_mode,omitempty" one_of:"dhcp,static,disabled" default:"dhcp"`
+	IPv4RequestAddress null.String       `json:"ipv4_request_address,omitempty"`
+	IPv4Static         *IPv4StaticConfig `json:"ipv4_static,omitempty" required_if:"IPv4Mode=static"`
 
 	IPv6Mode   null.String       `json:"ipv6_mode,omitempty" one_of:"slaac,dhcpv6,slaac_and_dhcpv6,static,link_local,disabled" default:"slaac"`
 	IPv6Static *IPv6StaticConfig `json:"ipv6_static,omitempty" required_if:"IPv6Mode=static"`

internal/network/config.go

@@ -95,6 +95,7 @@ func NewNetworkInterfaceState(opts *NetworkInterfaceOptions) (*NetworkInterfaceS
 
 			opts.OnDhcpLeaseChange(lease)
 		},
+		RequestAddress: s.config.IPv4RequestAddress.String,
 	})
 
 	s.dhcpClient = dhcpClient