Merge branch 'dev' into feat/multisession-support

.devcontainer/docker/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "JetKVM",
+	"name": "JetKVM docker devcontainer",
 	"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {

.devcontainer/install-deps.sh

@@ -32,4 +32,5 @@ wget https://github.com/jetkvm/rv1106-system/releases/download/${BUILDKIT_VERSIO
     sudo mkdir -p /opt/jetkvm-native-buildkit && \
     sudo tar --use-compress-program="unzstd --long=31" -xvf buildkit.tar.zst -C /opt/jetkvm-native-buildkit && \
     rm buildkit.tar.zst
-popd
+popd
+rm -rf "${BUILDKIT_TMPDIR}"

.devcontainer/podman/devcontainer.json

@@ -0,0 +1,19 @@
+{
+	"name": "JetKVM podman devcontainer",
+	"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			// Should match what is defined in ui/package.json
+			"version": "22.19.0"
+		}
+	},
+	"runArgs": [
+		"--userns=keep-id",
+		"--security-opt=label=disable",
+		"--security-opt=label=nested"
+	],
+	"containerUser": "vscode",
+	"containerEnv": {
+		"HOME": "/home/vscode"
+	}
+}

config.go

@@ -115,6 +115,7 @@ type Config struct {
 	NetworkConfig        *network.NetworkConfig `json:"network_config"`
 	DefaultLogLevel      string                 `json:"default_log_level"`
 	SessionSettings      *SessionSettings       `json:"session_settings"`
+	VideoSleepAfterSec   int                    `json:"video_sleep_after_sec"`
 }
 
 func (c *Config) GetDisplayRotation() uint16 {

internal/native/native.go

@@ -19,6 +19,7 @@ type Native struct {
 	onVideoFrameReceived func(frame []byte, duration time.Duration)
 	onIndevEvent         func(event string)
 	onRpcEvent           func(event string)
+	sleepModeSupported   bool
 	videoLock            sync.Mutex
 	screenLock           sync.Mutex
 }
@@ -62,6 +63,8 @@ func NewNative(opts NativeOptions) *Native {
 		}
 	}
 
+	sleepModeSupported := isSleepModeSupported()
+
 	return &Native{
 		ready:                make(chan struct{}),
 		l:                    nativeLogger,
@@ -73,6 +76,7 @@ func NewNative(opts NativeOptions) *Native {
 		onVideoFrameReceived: onVideoFrameReceived,
 		onIndevEvent:         onIndevEvent,
 		onRpcEvent:           onRpcEvent,
+		sleepModeSupported:   sleepModeSupported,
 		videoLock:            sync.Mutex{},
 		screenLock:           sync.Mutex{},
 	}

internal/native/video.go

@@ -1,5 +1,12 @@
 package native
 
+import (
+	"os"
+)
+
+const sleepModeFile = "/sys/devices/platform/ff470000.i2c/i2c-4/4-000f/sleep_mode"
+
+// VideoState is the state of the video stream.
 type VideoState struct {
 	Ready          bool    `json:"ready"`
 	Error          string  `json:"error,omitempty"` //no_signal, no_lock, out_of_range
@@ -8,6 +15,58 @@ type VideoState struct {
 	FramePerSecond float64 `json:"fps"`
 }
 
+func isSleepModeSupported() bool {
+	_, err := os.Stat(sleepModeFile)
+	return err == nil
+}
+
+func (n *Native) setSleepMode(enabled bool) error {
+	if !n.sleepModeSupported {
+		return nil
+	}
+
+	bEnabled := "0"
+	if enabled {
+		bEnabled = "1"
+	}
+	return os.WriteFile(sleepModeFile, []byte(bEnabled), 0644)
+}
+
+func (n *Native) getSleepMode() (bool, error) {
+	if !n.sleepModeSupported {
+		return false, nil
+	}
+
+	data, err := os.ReadFile(sleepModeFile)
+	if err == nil {
+		return string(data) == "1", nil
+	}
+
+	return false, nil
+}
+
+// VideoSetSleepMode sets the sleep mode for the video stream.
+func (n *Native) VideoSetSleepMode(enabled bool) error {
+	n.videoLock.Lock()
+	defer n.videoLock.Unlock()
+
+	return n.setSleepMode(enabled)
+}
+
+// VideoGetSleepMode gets the sleep mode for the video stream.
+func (n *Native) VideoGetSleepMode() (bool, error) {
+	n.videoLock.Lock()
+	defer n.videoLock.Unlock()
+
+	return n.getSleepMode()
+}
+
+// VideoSleepModeSupported checks if the sleep mode is supported.
+func (n *Native) VideoSleepModeSupported() bool {
+	return n.sleepModeSupported
+}
+
+// VideoSetQualityFactor sets the quality factor for the video stream.
 func (n *Native) VideoSetQualityFactor(factor float64) error {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
@@ -15,6 +74,7 @@ func (n *Native) VideoSetQualityFactor(factor float64) error {
 	return videoSetStreamQualityFactor(factor)
 }
 
+// VideoGetQualityFactor gets the quality factor for the video stream.
 func (n *Native) VideoGetQualityFactor() (float64, error) {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
@@ -22,6 +82,7 @@ func (n *Native) VideoGetQualityFactor() (float64, error) {
 	return videoGetStreamQualityFactor()
 }
 
+// VideoSetEDID sets the EDID for the video stream.
 func (n *Native) VideoSetEDID(edid string) error {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
@@ -29,6 +90,7 @@ func (n *Native) VideoSetEDID(edid string) error {
 	return videoSetEDID(edid)
 }
 
+// VideoGetEDID gets the EDID for the video stream.
 func (n *Native) VideoGetEDID() (string, error) {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
@@ -36,6 +98,7 @@ func (n *Native) VideoGetEDID() (string, error) {
 	return videoGetEDID()
 }
 
+// VideoLogStatus gets the log status for the video stream.
 func (n *Native) VideoLogStatus() (string, error) {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
@@ -43,6 +106,7 @@ func (n *Native) VideoLogStatus() (string, error) {
 	return videoLogStatus(), nil
 }
 
+// VideoStop stops the video stream.
 func (n *Native) VideoStop() error {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
@@ -51,10 +115,14 @@ func (n *Native) VideoStop() error {
 	return nil
 }
 
+// VideoStart starts the video stream.
 func (n *Native) VideoStart() error {
 	n.videoLock.Lock()
 	defer n.videoLock.Unlock()
 
+	// disable sleep mode before starting video
+	_ = n.setSleepMode(false)
+
 	videoStart()
 	return nil
 }

jsonrpc.go

@@ -1530,6 +1530,8 @@ var rpcHandlers = map[string]RPCHandler{
 	"getEDID":                {Func: rpcGetEDID},
 	"setEDID":                {Func: rpcSetEDID, Params: []string{"edid"}},
 	"getVideoLogStatus":      {Func: rpcGetVideoLogStatus},
+	"getVideoSleepMode":      {Func: rpcGetVideoSleepMode},
+	"setVideoSleepMode":      {Func: rpcSetVideoSleepMode, Params: []string{"duration"}},
 	"getDevChannelState":     {Func: rpcGetDevChannelState},
 	"setDevChannelState":     {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
 	"getLocalVersion":        {Func: rpcGetLocalVersion},

main.go

@@ -90,6 +90,9 @@ func Main() {
 	// initialize display
 	initDisplay()
 
+	// start video sleep mode timer
+	startVideoSleepModeTicker()
+
 	go func() {
 		time.Sleep(15 * time.Minute)
 		for {

ui/src/routes/devices.$id.mount.tsx

@@ -374,8 +374,8 @@ function UrlView({
       icon: FedoraIcon,
     },
     {
-      name: "openSUSE Leap 15.6",
-      url: "https://download.opensuse.org/distribution/leap/15.6/iso/openSUSE-Leap-15.6-NET-x86_64-Media.iso",
+      name: "openSUSE Leap 16.0",
+      url: "https://download.opensuse.org/distribution/leap/16.0/offline/Leap-16.0-online-installer-x86_64.install.iso",
       icon: OpenSUSEIcon,
     },
     {

video.go

@@ -1,10 +1,22 @@
 package kvm
 
 import (
+	"context"
+	"fmt"
+	"time"
+
 	"github.com/jetkvm/kvm/internal/native"
 )
 
-var lastVideoState native.VideoState
+var (
+	lastVideoState       native.VideoState
+	videoSleepModeCtx    context.Context
+	videoSleepModeCancel context.CancelFunc
+)
+
+const (
+	defaultVideoSleepModeDuration = 1 * time.Minute
+)
 
 func triggerVideoStateUpdate() {
 	go func() {
@@ -17,3 +29,92 @@ func triggerVideoStateUpdate() {
 func rpcGetVideoState() (native.VideoState, error) {
 	return lastVideoState, nil
 }
+
+type rpcVideoSleepModeResponse struct {
+	Supported bool `json:"supported"`
+	Enabled   bool `json:"enabled"`
+	Duration  int  `json:"duration"`
+}
+
+func rpcGetVideoSleepMode() rpcVideoSleepModeResponse {
+	sleepMode, _ := nativeInstance.VideoGetSleepMode()
+	return rpcVideoSleepModeResponse{
+		Supported: nativeInstance.VideoSleepModeSupported(),
+		Enabled:   sleepMode,
+		Duration:  config.VideoSleepAfterSec,
+	}
+}
+
+func rpcSetVideoSleepMode(duration int) error {
+	if duration < 0 {
+		duration = -1 // disable
+	}
+
+	config.VideoSleepAfterSec = duration
+	if err := SaveConfig(); err != nil {
+		return fmt.Errorf("failed to save config: %w", err)
+	}
+
+	// we won't restart the ticker here,
+	// as the session can't be inactive when this function is called
+	return nil
+}
+
+func stopVideoSleepModeTicker() {
+	nativeLogger.Trace().Msg("stopping HDMI sleep mode ticker")
+
+	if videoSleepModeCancel != nil {
+		nativeLogger.Trace().Msg("canceling HDMI sleep mode ticker context")
+		videoSleepModeCancel()
+		videoSleepModeCancel = nil
+		videoSleepModeCtx = nil
+	}
+}
+
+func startVideoSleepModeTicker() {
+	if !nativeInstance.VideoSleepModeSupported() {
+		return
+	}
+
+	var duration time.Duration
+
+	if config.VideoSleepAfterSec == 0 {
+		duration = defaultVideoSleepModeDuration
+	} else if config.VideoSleepAfterSec > 0 {
+		duration = time.Duration(config.VideoSleepAfterSec) * time.Second
+	} else {
+		stopVideoSleepModeTicker()
+		return
+	}
+
+	// Stop any existing timer and goroutine
+	stopVideoSleepModeTicker()
+
+	// Create new context for this ticker
+	videoSleepModeCtx, videoSleepModeCancel = context.WithCancel(context.Background())
+
+	go doVideoSleepModeTicker(videoSleepModeCtx, duration)
+}
+
+func doVideoSleepModeTicker(ctx context.Context, duration time.Duration) {
+	timer := time.NewTimer(duration)
+	defer timer.Stop()
+
+	nativeLogger.Trace().Msg("HDMI sleep mode ticker started")
+
+	for {
+		select {
+		case <-timer.C:
+			if getActiveSessions() > 0 {
+				nativeLogger.Warn().Msg("not going to enter HDMI sleep mode because there are active sessions")
+				continue
+			}
+
+			nativeLogger.Trace().Msg("entering HDMI sleep mode")
+			_ = nativeInstance.VideoSetSleepMode(true)
+		case <-ctx.Done():
+			nativeLogger.Trace().Msg("HDMI sleep mode ticker stopped")
+			return
+		}
+	}
+}

webrtc.go

@@ -65,6 +65,34 @@ type Session struct {
 	keysDownStateQueue chan usbgadget.KeysDownState
 }
 
+var (
+	actionSessions      int = 0
+	activeSessionsMutex     = &sync.Mutex{}
+)
+
+func incrActiveSessions() int {
+	activeSessionsMutex.Lock()
+	defer activeSessionsMutex.Unlock()
+
+	actionSessions++
+	return actionSessions
+}
+
+func decrActiveSessions() int {
+	activeSessionsMutex.Lock()
+	defer activeSessionsMutex.Unlock()
+
+	actionSessions--
+	return actionSessions
+}
+
+func getActiveSessions() int {
+	activeSessionsMutex.Lock()
+	defer activeSessionsMutex.Unlock()
+
+	return actionSessions
+}
+
 // CheckRPCRateLimit checks if the session has exceeded RPC rate limits (DoS protection)
 func (s *Session) CheckRPCRateLimit() bool {
 	const (
@@ -476,9 +504,8 @@ func newSession(config SessionConfig) (*Session, error) {
 		if connectionState == webrtc.ICEConnectionStateConnected {
 			if !isConnected {
 				isConnected = true
-				actionSessions++
 				onActiveSessionsChanged()
-				if actionSessions == 1 {
+				if incrActiveSessions() == 1 {
 					onFirstSessionConnected()
 				}
 			}
@@ -509,16 +536,16 @@ func newSession(config SessionConfig) (*Session, error) {
 	return session, nil
 }
 
-var actionSessions = 0
-
 func onActiveSessionsChanged() {
 	requestDisplayUpdate(true, "active_sessions_changed")
 }
 
 func onFirstSessionConnected() {
 	_ = nativeInstance.VideoStart()
+	stopVideoSleepModeTicker()
 }
 
 func onLastSessionDisconnected() {
 	_ = nativeInstance.VideoStop()
+	startVideoSleepModeTicker()
 }