split remote to desktop and capture.

server/internal/websocket/control.go

@@ -131,7 +131,7 @@ func (h *MessageHandler) controlClipboard(id string, session types.Session, payl
 		return nil
 	}
 
-	h.remote.WriteClipboard(payload.Text)
+	h.desktop.WriteClipboard(payload.Text)
 	return nil
 }
 
@@ -144,7 +144,7 @@ func (h *MessageHandler) controlKeyboard(id string, session types.Session, paylo
 
 	// change layout
 	if payload.Layout != nil {
-		h.remote.SetKeyboardLayout(*payload.Layout)
+		h.desktop.SetKeyboardLayout(*payload.Layout)
 	}
 
 	// set num lock
@@ -177,6 +177,6 @@ func (h *MessageHandler) controlKeyboard(id string, session types.Session, paylo
 		Int("ScrollLock", ScrollLock).
 		Msg("setting keyboard modifiers")
 
-	h.remote.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock)
+	h.desktop.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock)
 	return nil
 }

server/internal/websocket/handler.go

@@ -16,7 +16,8 @@ type MessageHandler struct {
 	logger    zerolog.Logger
 	sessions  types.SessionManager
 	webrtc    types.WebRTCManager
-	remote    types.RemoteManager
+	desktop   types.DesktopManager
+	capture   types.CaptureManager
 	broadcast types.BroadcastManager
 	banned    map[string]string // IP -> session ID (that banned it)
 	locked    map[string]string // resource name -> session ID (that locked it)

server/internal/websocket/screen.go

@@ -12,7 +12,7 @@ func (h *MessageHandler) screenSet(id string, session types.Session, payload *me
 		return nil
 	}
 
-	if err := h.remote.ChangeResolution(payload.Width, payload.Height, payload.Rate); err != nil {
+	if err := h.capture.ChangeResolution(payload.Width, payload.Height, payload.Rate); err != nil {
 		h.logger.Warn().Err(err).Msgf("unable to change screen size")
 		return err
 	}
@@ -33,7 +33,7 @@ func (h *MessageHandler) screenSet(id string, session types.Session, payload *me
 }
 
 func (h *MessageHandler) screenResolution(id string, session types.Session) error {
-	if size := h.remote.GetScreenSize(); size != nil {
+	if size := h.desktop.GetScreenSize(); size != nil {
 		if err := session.Send(message.ScreenResolution{
 			Event:  event.SCREEN_RESOLUTION,
 			Width:  size.Width,
@@ -56,7 +56,7 @@ func (h *MessageHandler) screenConfigurations(id string, session types.Session)
 
 	if err := session.Send(message.ScreenConfigurations{
 		Event:          event.SCREEN_CONFIGURATIONS,
-		Configurations: h.remote.ScreenConfigurations(),
+		Configurations: h.desktop.ScreenConfigurations(),
 	}); err != nil {
 		h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_CONFIGURATIONS)
 		return err

server/internal/websocket/websocket.go

@@ -20,7 +20,7 @@ import (
 
 const CONTROL_PROTECTION_SESSION = "by_control_protection"
 
-func New(sessions types.SessionManager, remote types.RemoteManager, broadcast types.BroadcastManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler {
+func New(sessions types.SessionManager, desktop types.DesktopManager, capture types.CaptureManager, broadcast types.BroadcastManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler {
 	logger := log.With().Str("module", "websocket").Logger()
 
 	locks := make(map[string]string)
@@ -45,7 +45,8 @@ func New(sessions types.SessionManager, remote types.RemoteManager, broadcast ty
 		shutdown: make(chan interface{}),
 		conf:     conf,
 		sessions: sessions,
-		remote:   remote,
+		desktop:  desktop,
+
 		upgrader: websocket.Upgrader{
 			CheckOrigin: func(r *http.Request) bool {
 				return true
@@ -53,7 +54,8 @@ func New(sessions types.SessionManager, remote types.RemoteManager, broadcast ty
 		},
 		handler: &MessageHandler{
 			logger:    logger.With().Str("subsystem", "handler").Logger(),
-			remote:    remote,
+			desktop:   desktop,
+			capture:   capture,
 			broadcast: broadcast,
 			sessions:  sessions,
 			webrtc:    webrtc,
@@ -73,7 +75,7 @@ type WebSocketHandler struct {
 	shutdown chan interface{}
 	upgrader websocket.Upgrader
 	sessions types.SessionManager
-	remote   types.RemoteManager
+	desktop  types.DesktopManager
 	conf     *config.WebSocket
 	handler  *MessageHandler
 
@@ -175,7 +177,7 @@ func (ws *WebSocketHandler) Start() {
 			ws.wg.Done()
 		}()
 
-		current := ws.remote.ReadClipboard()
+		current := ws.desktop.ReadClipboard()
 
 		for {
 			select {
@@ -188,7 +190,7 @@ func (ws *WebSocketHandler) Start() {
 					continue
 				}
 
-				text := ws.remote.ReadClipboard()
+				text := ws.desktop.ReadClipboard()
 				if text == current {
 					continue
 				}