Replace jetkvm_native binary with cgo

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
 	"name": "JetKVM",
-	"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
+	"image": "mcr.microsoft.com/devcontainers/go:1-1.24-bookworm",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
 			// Should match what is defined in ui/package.json

.github/workflows/build.yml

@@ -16,6 +16,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Cmake cache
+        uses: buildjet/cache@v4
+        with:
+          path: internal/native/cgo/build
+          key: jetkvm-cgo-${{ hashFiles('internal/native/cgo/**/*.c', 'internal/native/cgo/**/*.h', 'internal/native/cgo/**/*.patch', 'internal/native/cgo/**/*.txt', 'internal/native/cgo/**/*.sh', '!internal/native/cgo/build/**') }}
+          restore-keys: |
+            jetkvm-cgo-${{ hashFiles('internal/native/cgo/**/*.c', 'internal/native/cgo/**/*.h', 'internal/native/cgo/**/*.patch', 'internal/native/cgo/**/*.txt', 'internal/native/cgo/**/*.sh', '!internal/native/cgo/build/**') }}
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-  "tailwindCSS.classFunctions": ["cva", "cx"]
+  "tailwindCSS.classFunctions": [
+    "cva",
+    "cx"
+  ]
 }

Makefile

@@ -8,6 +8,9 @@ VERSION := 0.4.4
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := github.com/jetkvm/kvm
 
+BUILDKIT_FLAVOR := arm-rockchip830-linux-uclibcgnueabihf
+BUILDKIT_PATH ?= /opt/jetkvm-native-buildkit
+
 GO_BUILD_ARGS := -tags netgo
 GO_RELEASE_BUILD_ARGS := -trimpath $(GO_BUILD_ARGS)
 GO_LDFLAGS := \
@@ -17,20 +20,34 @@ GO_LDFLAGS := \
   -X $(PROMETHEUS_TAG).Revision=$(REVISION) \
   -X $(KVM_PKG_NAME).builtTimestamp=$(BUILDTS)
 
-GO_CMD := GOOS=linux GOARCH=arm GOARM=7 go
+GO_ARGS := GOOS=linux GOARCH=arm GOARM=7 ARCHFLAGS="-arch arm"
+# if BUILDKIT_PATH exists, use buildkit to build
+ifneq ($(wildcard $(BUILDKIT_PATH)),)
+	GO_ARGS := $(GO_ARGS) \
+		CGO_CFLAGS="-I$(BUILDKIT_PATH)/$(BUILDKIT_FLAVOR)/include -I$(BUILDKIT_PATH)/$(BUILDKIT_FLAVOR)/sysroot/usr/include" \
+		CGO_LDFLAGS="-L$(BUILDKIT_PATH)/$(BUILDKIT_FLAVOR)/lib -L$(BUILDKIT_PATH)/$(BUILDKIT_FLAVOR)/sysroot/usr/lib -lrockit -lrockchip_mpp -lrga -lpthread -lm" \
+		CC="$(BUILDKIT_PATH)/bin/$(BUILDKIT_FLAVOR)-gcc" \
+		LD="$(BUILDKIT_PATH)/bin/$(BUILDKIT_FLAVOR)-ld" \
+		CGO_ENABLED=1 
+	# GO_RELEASE_BUILD_ARGS := $(GO_RELEASE_BUILD_ARGS) -x -work
+endif
+
+GO_CMD := $(GO_ARGS) go
+
 BIN_DIR := $(shell pwd)/bin
 
 TEST_DIRS := $(shell find . -name "*_test.go" -type f -exec dirname {} \; | sort -u)
 
-hash_resource:
-	@shasum -a 256 resource/jetkvm_native | cut -d ' ' -f 1 > resource/jetkvm_native.sha256
+build_native:
+	@echo "Building native..."
+	cd internal/native/cgo && ./ui_index.gen.sh && ./build.sh
 
-build_dev: hash_resource
+build_dev: build_native
 	@echo "Building..."
 	$(GO_CMD) build \
 		-ldflags="$(GO_LDFLAGS) -X $(KVM_PKG_NAME).builtAppVersion=$(VERSION_DEV)" \
 		$(GO_RELEASE_BUILD_ARGS) \
-		-o $(BIN_DIR)/jetkvm_app cmd/main.go
+		-o $(BIN_DIR)/jetkvm_app -v cmd/main.go
 
 build_test2json:
 	$(GO_CMD) build -o $(BIN_DIR)/test2json cmd/test2json
@@ -86,4 +103,4 @@ release:
 	@echo "Uploading release..."
 	@shasum -a 256 bin/jetkvm_app | cut -d ' ' -f 1 > bin/jetkvm_app.sha256
 	rclone copyto bin/jetkvm_app r2://jetkvm-update/app/$(VERSION)/jetkvm_app
-	rclone copyto bin/jetkvm_app.sha256 r2://jetkvm-update/app/$(VERSION)/jetkvm_app.sha256
+	rclone copyto bin/jetkvm_app.sha256 r2://jetkvm-update/app/$(VERSION)/jetkvm_app.sha256

display.go

@@ -5,11 +5,14 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
+
+	"github.com/prometheus/common/version"
 )
 
-var currentScreen = "ui_Boot_Screen"
+var currentScreen = "boot_screen"
 var backlightState = 0 // 0 - NORMAL, 1 - DIMMED, 2 - OFF
 
 var (
@@ -22,120 +25,58 @@ const (
 	backlightControlClass string = "/sys/class/backlight/backlight/brightness"
 )
 
-func switchToScreen(screen string) {
-	_, err := CallCtrlAction("lv_scr_load", map[string]interface{}{"obj": screen})
-	if err != nil {
-		displayLogger.Warn().Err(err).Str("screen", screen).Msg("failed to switch to screen")
-		return
-	}
-	currentScreen = screen
-}
-
-var displayedTexts = make(map[string]string)
-
-func lvObjSetState(objName string, state string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_set_state", map[string]interface{}{"obj": objName, "state": state})
-}
-
-func lvObjAddFlag(objName string, flag string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_add_flag", map[string]interface{}{"obj": objName, "flag": flag})
-}
-
-func lvObjClearFlag(objName string, flag string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_clear_flag", map[string]interface{}{"obj": objName, "flag": flag})
-}
-
-func lvObjHide(objName string) (*CtrlResponse, error) {
-	return lvObjAddFlag(objName, "LV_OBJ_FLAG_HIDDEN")
-}
-
-func lvObjShow(objName string) (*CtrlResponse, error) {
-	return lvObjClearFlag(objName, "LV_OBJ_FLAG_HIDDEN")
-}
-
-func lvObjSetOpacity(objName string, opacity int) (*CtrlResponse, error) { // nolint:unused
-	return CallCtrlAction("lv_obj_set_style_opa_layered", map[string]interface{}{"obj": objName, "opa": opacity})
-}
-
-func lvObjFadeIn(objName string, duration uint32) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_fade_in", map[string]interface{}{"obj": objName, "time": duration})
-}
-
-func lvObjFadeOut(objName string, duration uint32) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_obj_fade_out", map[string]interface{}{"obj": objName, "time": duration})
-}
-
-func lvLabelSetText(objName string, text string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_label_set_text", map[string]interface{}{"obj": objName, "text": text})
-}
-
-func lvImgSetSrc(objName string, src string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_img_set_src", map[string]interface{}{"obj": objName, "src": src})
-}
-
-func lvDispSetRotation(rotation string) (*CtrlResponse, error) {
-	return CallCtrlAction("lv_disp_set_rotation", map[string]interface{}{"rotation": rotation})
-}
-
-func updateLabelIfChanged(objName string, newText string) {
-	if newText != "" && newText != displayedTexts[objName] {
-		_, _ = lvLabelSetText(objName, newText)
-		displayedTexts[objName] = newText
-	}
-}
-
-func switchToScreenIfDifferent(screenName string) {
-	if currentScreen != screenName {
-		displayLogger.Info().Str("from", currentScreen).Str("to", screenName).Msg("switching screen")
-		switchToScreen(screenName)
-	}
-}
-
 var (
 	cloudBlinkLock    sync.Mutex = sync.Mutex{}
 	cloudBlinkStopped bool
 	cloudBlinkTicker  *time.Ticker
 )
 
 func updateDisplay() {
-	updateLabelIfChanged("ui_Home_Content_Ip", networkState.IPv4String())
+	nativeInstance.UpdateLabelIfChanged("home_info_ipv4_addr", networkState.IPv4String())
+	nativeInstance.UpdateLabelAndChangeVisibility("home_info_ipv6_addr", networkState.IPv6String())
+
+	nativeInstance.ObjHide("menu_btn_network")
+	nativeInstance.ObjHide("menu_btn_access")
+
+	nativeInstance.UpdateLabelIfChanged("home_info_mac_addr", networkState.MACString())
+
 	if usbState == "configured" {
-		updateLabelIfChanged("ui_Home_Footer_Usb_Status_Label", "Connected")
-		_, _ = lvObjSetState("ui_Home_Footer_Usb_Status_Label", "LV_STATE_DEFAULT")
+		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Connected")
+		_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_DEFAULT")
 	} else {
-		updateLabelIfChanged("ui_Home_Footer_Usb_Status_Label", "Disconnected")
-		_, _ = lvObjSetState("ui_Home_Footer_Usb_Status_Label", "LV_STATE_USER_2")
+		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Disconnected")
+		_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_DISABLED")
 	}
 	if lastVideoState.Ready {
-		updateLabelIfChanged("ui_Home_Footer_Hdmi_Status_Label", "Connected")
-		_, _ = lvObjSetState("ui_Home_Footer_Hdmi_Status_Label", "LV_STATE_DEFAULT")
+		nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Connected")
+		_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_DEFAULT")
 	} else {
-		updateLabelIfChanged("ui_Home_Footer_Hdmi_Status_Label", "Disconnected")
-		_, _ = lvObjSetState("ui_Home_Footer_Hdmi_Status_Label", "LV_STATE_USER_2")
+		nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Disconnected")
+		_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_DISABLED")
 	}
-	updateLabelIfChanged("ui_Home_Header_Cloud_Status_Label", fmt.Sprintf("%d active", actionSessions))
+	nativeInstance.UpdateLabelIfChanged("cloud_status_label", fmt.Sprintf("%d active", actionSessions))
 
 	if networkState.IsUp() {
-		switchToScreenIfDifferent("ui_Home_Screen")
+		nativeInstance.SwitchToScreenIf("home_screen", []string{"no_network_screen", "boot_screen"})
 	} else {
-		switchToScreenIfDifferent("ui_No_Network_Screen")
+		nativeInstance.SwitchToScreenIf("no_network_screen", []string{"home_screen", "boot_screen"})
 	}
 
 	if cloudConnectionState == CloudConnectionStateNotConfigured {
-		_, _ = lvObjHide("ui_Home_Header_Cloud_Status_Icon")
+		_, _ = nativeInstance.ObjHide("cloud_status_icon")
 	} else {
-		_, _ = lvObjShow("ui_Home_Header_Cloud_Status_Icon")
+		_, _ = nativeInstance.ObjShow("cloud_status_icon")
 	}
 
 	switch cloudConnectionState {
 	case CloudConnectionStateDisconnected:
-		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud_disconnected.png")
+		_, _ = nativeInstance.ImgSetSrc("cloud_status_icon", "cloud_disconnected")
 		stopCloudBlink()
 	case CloudConnectionStateConnecting:
-		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud.png")
+		_, _ = nativeInstance.ImgSetSrc("cloud_status_icon", "cloud")
 		startCloudBlink()
 	case CloudConnectionStateConnected:
-		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud.png")
+		_, _ = nativeInstance.ImgSetSrc("cloud_status_icon", "cloud")
 		stopCloudBlink()
 	}
 }
@@ -159,9 +100,9 @@ func startCloudBlink() {
 			if cloudConnectionState != CloudConnectionStateConnecting {
 				continue
 			}
-			_, _ = lvObjFadeOut("ui_Home_Header_Cloud_Status_Icon", 1000)
+			_, _ = nativeInstance.ObjFadeOut("cloud_status_icon", 1000)
 			time.Sleep(1000 * time.Millisecond)
-			_, _ = lvObjFadeIn("ui_Home_Header_Cloud_Status_Icon", 1000)
+			_, _ = nativeInstance.ObjFadeIn("cloud_status_icon", 1000)
 			time.Sleep(1000 * time.Millisecond)
 		}
 	}()
@@ -205,20 +146,45 @@ func waitCtrlAndRequestDisplayUpdate(shouldWakeDisplay bool) {
 	waitDisplayUpdate.Lock()
 	defer waitDisplayUpdate.Unlock()
 
-	waitCtrlClientConnected()
+	// nativeInstance.WaitCtrlClientConnected()
 	requestDisplayUpdate(shouldWakeDisplay)
 }
 
 func updateStaticContents() {
 	//contents that never change
-	updateLabelIfChanged("ui_Home_Content_Mac", networkState.MACString())
+	nativeInstance.UpdateLabelIfChanged("home_info_mac_addr", networkState.MACString())
 	systemVersion, appVersion, err := GetLocalVersion()
 	if err == nil {
-		updateLabelIfChanged("ui_About_Content_Operating_System_Version_ContentLabel", systemVersion.String())
-		updateLabelIfChanged("ui_About_Content_App_Version_Content_Label", appVersion.String())
+		nativeInstance.UpdateLabelIfChanged("boot_screen_version", systemVersion.String())
+		nativeInstance.UpdateLabelIfChanged("boot_screen_app_version", appVersion.String())
+		nativeInstance.UpdateLabelAndChangeVisibility("system_version", systemVersion.String())
+		nativeInstance.UpdateLabelAndChangeVisibility("app_version", appVersion.String())
 	}
 
-	updateLabelIfChanged("ui_Status_Content_Device_Id_Content_Label", GetDeviceID())
+	// get cpu info
+	cpuInfo, err := os.ReadFile("/proc/cpuinfo")
+	// get the line starting with "Serial"
+	for _, line := range strings.Split(string(cpuInfo), "\n") {
+		if strings.HasPrefix(line, "Serial") {
+			serial := strings.SplitN(line, ":", 2)[1]
+			nativeInstance.UpdateLabelAndChangeVisibility("cpu_serial", strings.TrimSpace(serial))
+			break
+		}
+	}
+
+	// get kernel version
+	kernelVersion, err := os.ReadFile("/proc/version")
+	if err == nil {
+		kernelVersion := strings.TrimPrefix(string(kernelVersion), "Linux version ")
+		kernelVersion = strings.SplitN(kernelVersion, " ", 2)[0]
+		nativeInstance.UpdateLabelAndChangeVisibility("kernel_version", kernelVersion)
+	}
+
+	nativeInstance.UpdateLabelAndChangeVisibility("build_branch", version.Branch)
+	nativeInstance.UpdateLabelAndChangeVisibility("build_date", version.BuildDate)
+	nativeInstance.UpdateLabelAndChangeVisibility("golang_version", version.GoVersion)
+
+	// nativeInstance.UpdateLabelAndChangeVisibility("boot_screen_device_id", GetDeviceID())
 }
 
 // setDisplayBrightness sets /sys/class/backlight/backlight/brightness to alter
@@ -379,10 +345,9 @@ func startBacklightTickers() {
 
 func initDisplay() {
 	go func() {
-		waitCtrlClientConnected()
 		displayLogger.Info().Msg("setting initial display contents")
 		time.Sleep(500 * time.Millisecond)
-		_, _ = lvDispSetRotation(config.DisplayRotation)
+		_, _ = nativeInstance.DispSetRotation(config.DisplayRotation)
 		updateStaticContents()
 		displayInited = true
 		displayLogger.Info().Msg("display inited")

go.mod

@@ -11,12 +11,15 @@ require (
 	github.com/coreos/go-oidc/v3 v3.11.0
 	github.com/creack/pty v1.1.23
 	github.com/fsnotify/fsnotify v1.9.0
-	github.com/gin-contrib/logger v1.2.6
-	github.com/gin-gonic/gin v1.10.1
+	github.com/gin-contrib/logger v1.2.5
+	github.com/gin-gonic/gin v1.10.0
+	github.com/google/gopacket v1.1.19
 	github.com/google/uuid v1.6.0
 	github.com/guregu/null/v6 v6.0.0
 	github.com/gwatts/rootcerts v0.0.0-20240401182218-3ab9db955caf
-	github.com/hanwen/go-fuse/v2 v2.8.0
+	github.com/hanwen/go-fuse/v2 v2.5.1
+	github.com/hashicorp/go-getter/v2 v2.2.3
+	github.com/jellydator/ttlcache/v3 v3.3.0
 	github.com/pion/logging v0.2.3
 	github.com/pion/mdns/v2 v2.0.7
 	github.com/pion/webrtc/v4 v4.0.16
@@ -30,15 +33,16 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/vishvananda/netlink v1.3.0
 	go.bug.st/serial v1.6.2
-	golang.org/x/crypto v0.39.0
-	golang.org/x/net v0.41.0
-	golang.org/x/sys v0.33.0
+	golang.org/x/crypto v0.37.0
+	golang.org/x/net v0.39.0
+	golang.org/x/sys v0.32.0
 )
 
 replace github.com/pojntfx/go-nbd v0.3.2 => github.com/chemhack/go-nbd v0.0.0-20241006125820-59e45f5b1e7b
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bytedance/sonic v1.13.2 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -52,11 +56,19 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.26.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
+	github.com/hashicorp/go-version v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/go-homedir v1.0.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -80,11 +92,13 @@ require (
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/ulikunitz/xz v0.5.8 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	golang.org/x/arch v0.17.0 // indirect
 	golang.org/x/oauth2 v0.24.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )