fix: Log spam when using a web terminal #547

terminal.go

@@ -1,6 +1,7 @@
 package kvm
 
 import (
+	"bytes"
 	"encoding/json"
 	"io"
 	"os"
@@ -55,18 +56,23 @@ func handleTerminalChannel(d *webrtc.DataChannel) {
 			return
 		}
 		if msg.IsString {
-			var size TerminalSize
+			maybeJson := bytes.TrimSpace(msg.Data)
-			err := json.Unmarshal([]byte(msg.Data), &size)
+			// Cheap check to see if this resembles JSON
-			if err == nil {
+			if len(maybeJson) > 1 && maybeJson[0] == '{' && maybeJson[len(maybeJson)-1] == '}' {
-				err = pty.Setsize(ptmx, &pty.Winsize{
+				var size TerminalSize
-					Rows: uint16(size.Rows),
+				err := json.Unmarshal(maybeJson, &size)
-					Cols: uint16(size.Cols),
-				})
 				if err == nil {
-					return
+					err = pty.Setsize(ptmx, &pty.Winsize{
+						Rows: uint16(size.Rows),
+						Cols: uint16(size.Cols),
+					})
+					if err == nil {
+						scopedLogger.Info().Int("rows", size.Rows).Int("cols", size.Cols).Msg("Set terminal size")
+						return
+					}
 				}
+				scopedLogger.Warn().Err(err).Msg("Failed to parse terminal size")
 			}
-			scopedLogger.Warn().Err(err).Msg("Failed to parse terminal size")
 		}
 		_, err := ptmx.Write(msg.Data)
 		if err != nil {