live change resolution (WIP)

server/internal/websocket/control.go

@@ -1,10 +1,10 @@
 package websocket
 
 import (
-	"n.eko.moe/neko/internal/hid"
 	"n.eko.moe/neko/internal/types"
 	"n.eko.moe/neko/internal/types/event"
 	"n.eko.moe/neko/internal/types/message"
+	"n.eko.moe/neko/internal/xorg"
 )
 
 func (h *MessageHandler) controlRelease(id string, session types.Session) error {
@@ -113,6 +113,6 @@ func (h *MessageHandler) controlClipboard(id string, session types.Session, payl
 		return nil
 	}
 
-	hid.WriteClipboard(payload.Text)
+	xorg.WriteClipboard(payload.Text)
 	return nil
 }

server/internal/websocket/handler.go

@@ -103,6 +103,18 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
 				return h.chatEmote(id, session, payload)
 			}), "%s failed", header.Event)
 
+	// Screen Events
+	case event.SCREEN_RESOLUTION:
+		return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event)
+	case event.SCREEN_CONFIGURATIONS:
+		return errors.Wrapf(h.screenConfigurations(id, session), "%s failed", header.Event)
+	case event.SCREEN_SET:
+		payload := &message.ScreenResolution{}
+		return errors.Wrapf(
+			utils.Unmarshal(payload, raw, func() error {
+				return h.screenSet(id, session, payload)
+			}), "%s failed", header.Event)
+
 	// Admin Events
 	case event.ADMIN_LOCK:
 		return errors.Wrapf(h.adminLock(id, session), "%s failed", header.Event)

server/internal/websocket/screen.go

@@ -0,0 +1,67 @@
+package websocket
+
+import (
+	"n.eko.moe/neko/internal/types"
+	"n.eko.moe/neko/internal/types/event"
+	"n.eko.moe/neko/internal/types/message"
+	"n.eko.moe/neko/internal/xorg"
+)
+
+func (h *MessageHandler) screenSet(id string, session types.Session, payload *message.ScreenResolution) error {
+	if !session.Admin() {
+		h.logger.Debug().Msg("user not admin")
+		return nil
+	}
+
+	if err := h.webrtc.ChangeScreenSize(payload.Width, payload.Height, payload.Rate); err != nil {
+		h.logger.Warn().Err(err).Msgf("unable to change screen size")
+		return err
+	}
+
+	if err := h.sessions.Brodcast(
+		message.ScreenResolution{
+			Event:  event.SCREEN_RESOLUTION,
+			ID:     id,
+			Width:  payload.Width,
+			Height: payload.Height,
+			Rate:   payload.Rate,
+		}, nil); err != nil {
+		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.SCREEN_RESOLUTION)
+		return err
+	}
+
+	return nil
+}
+
+func (h *MessageHandler) screenResolution(id string, session types.Session) error {
+	if size := xorg.GetScreenSize(); size != nil {
+		if err := session.Send(message.ScreenResolution{
+			Event:  event.SCREEN_RESOLUTION,
+			Width:  size.Width,
+			Height: size.Height,
+			Rate:   int(size.Rate),
+		}); err != nil {
+			h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION)
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (h *MessageHandler) screenConfigurations(id string, session types.Session) error {
+	if !session.Admin() {
+		h.logger.Debug().Msg("user not admin")
+		return nil
+	}
+
+	if err := session.Send(message.ScreenConfigurations{
+		Event:          event.SCREEN_CONFIGURATIONS,
+		Configurations: xorg.ScreenConfigurations,
+	}); err != nil {
+		h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_CONFIGURATIONS)
+		return err
+	}
+
+	return nil
+}

server/internal/websocket/session.go

@@ -14,6 +14,18 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
 		return err
 	}
 
+	// send screen current resolution
+	if err := h.screenResolution(id, session); err != nil {
+		return err
+	}
+
+	if session.Admin() {
+		// send screen configurations
+		if err := h.screenConfigurations(id, session); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 

server/internal/websocket/websocket.go

@@ -9,12 +9,12 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"n.eko.moe/neko/internal/hid"
 	"n.eko.moe/neko/internal/types"
 	"n.eko.moe/neko/internal/types/config"
 	"n.eko.moe/neko/internal/types/event"
 	"n.eko.moe/neko/internal/types/message"
 	"n.eko.moe/neko/internal/utils"
+	"n.eko.moe/neko/internal/xorg"
 )
 
 func New(sessions types.SessionManager, webrtc types.WebRTCManager, conf *config.WebSocket) *WebSocketHandler {
@@ -81,7 +81,7 @@ func (ws *WebSocketHandler) Start() error {
 			ws.logger.Info().Msg("shutdown")
 		}()
 
-		current := hid.ReadClipboard()
+		current := xorg.ReadClipboard()
 
 		for {
 			select {
@@ -89,7 +89,7 @@ func (ws *WebSocketHandler) Start() error {
 				return
 			default:
 				if ws.sessions.HasHost() {
-					text := hid.ReadClipboard()
+					text := xorg.ReadClipboard()
 					if text != current {
 						session, ok := ws.sessions.GetHost()
 						if ok {