Update App version to 0.0.3

Author: luckfox-eng29

.gitignore

@@ -6,6 +6,6 @@ static/*
 package-lock.json
 package.json
 node_modules/
-
+ui/.i18n_extractor.json
 
 device-tests.tar.gz

Makefile

@@ -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.2-dev
-VERSION ?= 0.0.2
+VERSION_DEV ?= 0.0.3-dev
+VERSION ?= 0.0.3
 
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := kvm

README.md

@@ -0,0 +1,29 @@
+![luckfox](https://github.com/LuckfoxTECH/luckfox-pico/assets/144299491/cec5c4a5-22b9-4a9a-abb1-704b11651e88)
+[中文](./README_CN.md)
+# Luckfox PicoKVM
+Luckfox PicoKVM is a lightweight IP KVM operation and maintenance tool. It allows remote access to a target device’s display and simulates HID input over the network, enabling contactless operation and management of development boards, PCs, and servers. The product delivers stable, low-latency video capture and remote control, making it well-suited for scenarios such as remote computer management and server maintenance. The software is based on a secondary development of JetKVM.
+
+## Features
+* **Micro SD card support**: Used for software boot settings or storage expansion
+* **USB multifunction configuration**: Supports emulating a USB sound card or MTP device. Files in the shared MTP directory can be uploaded or downloaded via HTTP
+* **Serial port control**: Connects to the serial port of the controlled device for control and debugging
+* **IO level configuration**: Controls expansion IO output (high/low level)
+* **1.54-inch touchscreen**: Displays IP address, connection status, and system runtime status
+* **Multiple remote access methods**: Remote management via WebRTC through cross-network connections or FRP reverse proxy
+
+## Compilation
+* Compile frontend only
+  ```bash
+  make frontend
+  ```
+* Compile backend only
+  ```bash
+  make build_dev
+  ```
+* Full compilation
+  ```bash
+  make build_release
+  ```
+
+## Detailed Usage Instructions
+[Luckfox PicoKVM](https://wiki.luckfox.com/Luckfox-PicoKVM/)

README_CN.md

@@ -0,0 +1,29 @@
+![luckfox](https://github.com/LuckfoxTECH/luckfox-pico/assets/144299491/cec5c4a5-22b9-4a9a-abb1-704b11651e88)
+[English](./README.md)
+# Luckfox PicoKVM
+Luckfox PicoKVM 是一款轻量级 IP KVM 运维工具，支持通过网络远程获取目标设备画面并模拟 HID 输入，实现对开发板、电脑及服务器等系统的无接触运维管理。该产品具备稳定、低延迟的视频采集和远程控制能力，广泛适用于远程电脑控制和服务器维护等场景。软件基于 JetKVM 二次开发。
+
+## 特性
+* **Micro SD 卡支持**:可用于软件启动设置或存储拓展
+* **USB 多功能配置**:支持模拟 USB 声卡或 MTP 设备，在 MTP 共享目录下可通过 HTTP 上传或下载文件 
+* **串口控制**:可连接受控设备的串口，实现对受控设备的串口控制和调试
+* **IO 电平配置**:控制拓展 IO 输出高低电平
+* **1.54 寸触控屏幕**:显示 IP 地址、连接状态及系统运行状态
+* **多种远程访问方案**:使用 WebRTC 通过异域组网或 FRP 端口反向代理进行远程管理
+
+## 编译
+* 仅编译前端
+    ```bash
+    make frontend
+    ```
+* 仅编译后端
+    ```bash
+    make build_dev
+    ```
+* 完整编译
+    ```bash
+    make build_release
+    ```
+
+## 详细使用说明
+[Luckfox PicoKVM](https://wiki.luckfox.com/zh/Luckfox-PicoKVM/)

config.go

@@ -114,6 +114,9 @@ type Config struct {
 	TimeZone             string                 `json:"time_zone"`
 	LEDGreenMode         string                 `json:"led_green_mode"`
 	LEDYellowMode        string                 `json:"led_yellow_mode"`
+	AutoMountSystemInfo  bool                   `json:"auto_mount_system_info_img"`
+	EasytierAutoStart    bool                   `json:"easytier_autostart"`
+	EasytierConfig       EasytierConfig         `json:"easytier_config"`
 }
 
 const configPath = "/userdata/kvm_config.json"
@@ -146,17 +149,18 @@ var defaultConfig = &Config{
 		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",
-	LEDGreenMode:       "network-rx",
-	LEDYellowMode:      "kernel-activity",
+	NetworkConfig:       &network.NetworkConfig{},
+	DefaultLogLevel:     "INFO",
+	ZeroTierAutoStart:   false,
+	TailScaleAutoStart:  false,
+	TailScaleXEdge:      false,
+	FrpcAutoStart:       false,
+	IO0Status:           true,
+	IO1Status:           true,
+	AudioMode:           "disabled",
+	LEDGreenMode:        "network-rx",
+	LEDYellowMode:       "kernel-activity",
+	AutoMountSystemInfo: true,
 }
 
 var (
@@ -174,15 +178,16 @@ func LoadConfig() {
 	}
 
 	// load the default config
-	config = defaultConfig
-	if config.UsbConfig.SerialNumber == "" {
+	if defaultConfig.UsbConfig.SerialNumber == "" {
 		serialNumber, err := extractSerialNumber()
 		if err != nil {
 			logger.Warn().Err(err).Msg("failed to extract serial number")
 		} else {
-			config.UsbConfig.SerialNumber = serialNumber
+			defaultConfig.UsbConfig.SerialNumber = serialNumber
 		}
 	}
+	loadedConfig := *defaultConfig
+	config = &loadedConfig
 
 	file, err := os.Open(configPath)
 	if err != nil {
@@ -192,7 +197,6 @@ func LoadConfig() {
 	defer file.Close()
 
 	// load and merge the default config with the user config
-	loadedConfig := *defaultConfig
 	if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil {
 		logger.Warn().Err(err).Msg("config file JSON parsing failed")
 		os.Remove(configPath)

internal/usbgadget/udc.go

@@ -80,7 +80,15 @@ func (u *UsbGadget) IsUDCBound() (bool, error) {
 
 // BindUDC binds the gadget to the UDC.
 func (u *UsbGadget) BindUDC() error {
-	err := os.WriteFile(path.Join(udcPath, "bind"), []byte(u.udc), 0644)
+	err := os.WriteFile(udcPath, []byte(u.udc), 0644)
+	if err != nil {
+		return fmt.Errorf("error binding UDC: %w", err)
+	}
+	return nil
+}
+
+func (u *UsbGadget) BindUDCToDWC3() error {
+	err := os.WriteFile(path.Join(dwc3Path, "bind"), []byte(u.udc), 0644)
 	if err != nil {
 		return fmt.Errorf("error binding UDC: %w", err)
 	}
@@ -89,7 +97,15 @@ func (u *UsbGadget) BindUDC() error {
 
 // UnbindUDC unbinds the gadget from the UDC.
 func (u *UsbGadget) UnbindUDC() error {
-	err := os.WriteFile(path.Join(udcPath, " "), []byte(u.udc), 0644)
+	err := os.WriteFile(udcPath, []byte("none"), 0644)
+	if err != nil {
+		return fmt.Errorf("error unbinding UDC: %w", err)
+	}
+	return nil
+}
+
+func (u *UsbGadget) UnbindUDCToDWC3() error {
+	err := os.WriteFile(path.Join(dwc3Path, "unbind"), []byte(u.udc), 0644)
 	if err != nil {
 		return fmt.Errorf("error unbinding UDC: %w", err)
 	}

internal/usbgadget/usbgadget.go

@@ -84,6 +84,7 @@ type UsbGadget struct {
 	log *zerolog.Logger
 
 	logSuppressionCounter map[string]int
+	logLock               sync.Mutex
 }
 
 const configFSPath = "/sys/kernel/config"

internal/usbgadget/utils.go

@@ -82,6 +82,9 @@ func compareFileContent(oldContent []byte, newContent []byte, looserMatch bool)
 }
 
 func (u *UsbGadget) logWithSupression(counterName string, every int, logger *zerolog.Logger, err error, msg string, args ...interface{}) {
+	u.logLock.Lock()
+	defer u.logLock.Unlock()
+
 	if _, ok := u.logSuppressionCounter[counterName]; !ok {
 		u.logSuppressionCounter[counterName] = 0
 	} else {

jsonrpc.go

@@ -628,9 +628,9 @@ func rpcGetUsbEmulationState() (bool, error) {
 
 func rpcSetUsbEmulationState(enabled bool) error {
 	if enabled {
-		return gadget.BindUDC()
+		return gadget.BindUDCToDWC3()
 	} else {
-		return gadget.UnbindUDC()
+		return gadget.UnbindUDCToDWC3()
 	}
 }
 
@@ -663,7 +663,8 @@ func rpcSetWakeOnLanDevices(params SetWakeOnLanDevicesParams) error {
 }
 
 func rpcResetConfig() error {
-	config = defaultConfig
+	loadedConfig := *defaultConfig
+	config = &loadedConfig
 	if err := SaveConfig(); err != nil {
 		return fmt.Errorf("failed to reset config: %w", err)
 	}
@@ -1029,6 +1030,18 @@ func rpcGetLedYellowMode() (string, error) {
 	return config.LEDYellowMode, nil
 }
 
+func rpcGetAutoMountSystemInfo() (bool, error) {
+	return config.AutoMountSystemInfo, nil
+}
+
+func rpcSetAutoMountSystemInfo(enabled bool) error {
+	config.AutoMountSystemInfo = enabled
+	if err := SaveConfig(); err != nil {
+		return fmt.Errorf("failed to save config: %w", err)
+	}
+	return nil
+}
+
 var rpcHandlers = map[string]RPCHandler{
 	"ping":                     {Func: rpcPing},
 	"reboot":                   {Func: rpcReboot, Params: []string{"force"}},
@@ -1084,6 +1097,8 @@ var rpcHandlers = map[string]RPCHandler{
 	"mountWithWebRTC":          {Func: rpcMountWithWebRTC, Params: []string{"filename", "size", "mode"}},
 	"mountWithStorage":         {Func: rpcMountWithStorage, Params: []string{"filename", "mode"}},
 	"mountWithSDStorage":       {Func: rpcMountWithSDStorage, Params: []string{"filename", "mode"}},
+	"setAutoMountSystemInfo":   {Func: rpcSetAutoMountSystemInfo, Params: []string{"enabled"}},
+	"getAutoMountSystemInfo":   {Func: rpcGetAutoMountSystemInfo},
 	"listStorageFiles":         {Func: rpcListStorageFiles},
 	"deleteStorageFile":        {Func: rpcDeleteStorageFile, Params: []string{"filename"}},
 	"startStorageFileUpload":   {Func: rpcStartStorageFileUpload, Params: []string{"filename", "size"}},
@@ -1121,7 +1136,7 @@ var rpcHandlers = map[string]RPCHandler{
 	"getSDMountStatus":         {Func: rpcGetSDMountStatus},
 	"loginTailScale":           {Func: rpcLoginTailScale, Params: []string{"xEdge"}},
 	"logoutTailScale":          {Func: rpcLogoutTailScale},
-	"canelTailScale":           {Func: rpcCanelTailScale},
+	"cancelTailScale":          {Func: rpcCancelTailScale},
 	"getTailScaleSettings":     {Func: rpcGetTailScaleSettings},
 	"loginZeroTier":            {Func: rpcLoginZeroTier, Params: []string{"networkID"}},
 	"logoutZeroTier":           {Func: rpcLogoutZeroTier, Params: []string{"networkID"}},
@@ -1134,4 +1149,10 @@ var rpcHandlers = map[string]RPCHandler{
 	"getFrpcStatus":            {Func: rpcGetFrpcStatus},
 	"getFrpcToml":              {Func: rpcGetFrpcToml},
 	"getFrpcLog":               {Func: rpcGetFrpcLog},
+	"startEasyTier":            {Func: rpcStartEasyTier, Params: []string{"name", "secret", "node"}},
+	"stopEasyTier":             {Func: rpcStopEasyTier},
+	"getEasyTierStatus":        {Func: rpcGetEasyTierStatus},
+	"getEasyTierConfig":        {Func: rpcGetEasyTierConfig},
+	"getEasyTierLog":           {Func: rpcGetEasyTierLog},
+	"getEasyTierNodeInfo":      {Func: rpcGetEasyTierNodeInfo},
 }

ota.go

@@ -59,7 +59,7 @@ var UpdateMetadataUrls = []string{
 	"https://api.github.com/repos/luckfox-eng29/kvm/releases/latest",
 }
 
-var builtAppVersion = "0.0.2+dev"
+var builtAppVersion = "0.0.3+dev"
 
 var updateSource = "github"