fix: better packet handling for overly chatty servers like rust

Author: UltimateForm

Makefile

@@ -1,6 +1,12 @@
 RCON_PASSWORD=localpassword
 RCON_PORT=7778
 
+
+wire-podman-vlms:
+	podman unshare chown 1000:1000 .serverdata/rust/common.cfg
+	podman unshare chown 1000:1000 .serverdata/mh/common.cfg
+	podman unshare chown 1000:1000 .serverdata/mh/Game.ini
+
 lift-mh-server:
 	docker compose run mh-server
 

cmd/main.go

@@ -15,7 +15,6 @@ import (
 	"github.com/UltimateForm/tcprcon-cli/internal/config"
 	"github.com/UltimateForm/tcprcon/pkg/common_rcon"
 	"github.com/UltimateForm/tcprcon/pkg/logger"
-	"github.com/UltimateForm/tcprcon/pkg/packet"
 	"github.com/UltimateForm/tcprcon/pkg/rcon"
 	"golang.org/x/term"
 )
@@ -84,28 +83,6 @@ func determinePassword(currentPw string) (string, error) {
 	return password, nil
 }
 
-func execInputCmd(rcon *rcon.Client) error {
-	logger.Debug.Println("executing input command: " + inputCmdParam)
-	execPacket := packet.New(rcon.Id(), packet.SERVERDATA_EXECCOMMAND, []byte(inputCmdParam))
-	fmt.Printf(
-		"(%v): SND CMD %v\n",
-		ansi.Format(strconv.Itoa(int(rcon.Id())), ansi.Green, ansi.Bold),
-		ansi.Format(inputCmdParam, ansi.Blue),
-	)
-	rcon.Write(execPacket.Serialize())
-	packetRes, err := packet.Read(rcon)
-	if err != nil {
-		return errors.Join(errors.New("error while reading from RCON client"), err)
-	}
-	fmt.Printf(
-		"(%v): RCV PKT %v\n%v\n",
-		ansi.Format(strconv.Itoa(int(rcon.Id())), ansi.Green, ansi.Bold),
-		ansi.Format(strconv.Itoa(int(packetRes.Type)), ansi.Green, ansi.Bold),
-		ansi.Format(strings.TrimRight(packetRes.BodyStr(), "\n\r"), ansi.Green),
-	)
-	return nil
-}
-
 func Execute() {
 	flag.Parse()
 	logLevel := uint8(logLevelParam)
@@ -191,15 +168,16 @@ func Execute() {
 		return
 	}
 
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
 	if inputCmdParam != "" {
-		if err := execInputCmd(rconClient); err != nil {
+		if err := execInputCmd(ctx, rconClient); err != nil {
 			logger.Critical.Println(err)
 		}
 		return
 	} else {
 		// could just rely on early return but i feel anxious :D
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
 		runRconTerminal(
 			ctx,
 			rconClient,

cmd/single.go

@@ -0,0 +1,49 @@
+package cmd
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/UltimateForm/tcprcon-cli/internal/ansi"
+	"github.com/UltimateForm/tcprcon/pkg/logger"
+	"github.com/UltimateForm/tcprcon/pkg/packet"
+	"github.com/UltimateForm/tcprcon/pkg/rcon"
+)
+
+func execInputCmd(ctx context.Context, rcon *rcon.Client) error {
+	logger.Debug.Println("executing input command: " + inputCmdParam)
+	id := rcon.Id()
+	execPacket := packet.New(id, packet.SERVERDATA_EXECCOMMAND, []byte(inputCmdParam))
+	fmt.Printf(
+		"(%v): SND CMD %v\n",
+		ansi.Format(strconv.Itoa(int(id)), ansi.Green, ansi.Bold),
+		ansi.Format(inputCmdParam, ansi.Blue),
+	)
+	rcon.Write(execPacket.Serialize())
+	// not totally effective since response reader has its own internally defined timeout
+	timeoutCtx, cancel := context.WithTimeout(ctx, time.Second*10)
+	defer cancel()
+	responseChan := packet.CreateResponseChannel(rcon, timeoutCtx)
+	for {
+		select {
+		case <-timeoutCtx.Done():
+			return errors.New("timeout while waiting for response")
+		case pkt := <-responseChan:
+			if pkt.Id != id {
+				logger.Warn.Printf("ignoring a packet with mismatched ID: %v vs %v; possibly overly chatty server\n", id, pkt.Id)
+				continue
+			}
+			fmt.Printf(
+				"(%v): RCV PKT %v\n%v\n",
+				ansi.Format(strconv.Itoa(int(pkt.Id)), ansi.Green, ansi.Bold),
+				ansi.Format(strconv.Itoa(int(pkt.Type)), ansi.Green, ansi.Bold),
+				ansi.Format(strings.TrimRight(pkt.BodyStr(), "\n\r"), ansi.Green),
+			)
+			return nil
+		}
+	}
+}

compose.yaml

@@ -19,8 +19,8 @@ services:
       start_period: 30s
     volumes:
       - linuxgsm-mh:/data
-      - .serverdata/mh/common.cfg:/data/config-lgsm/mhserver/common.cfg
-      - .serverdata/mh/Game.ini:/data/serverfiles/Mordhau/Saved/Config/LinuxServer/Game.ini
+      - .serverdata/mh/common.cfg:/data/config-lgsm/mhserver/common.cfg:Z
+      - .serverdata/mh/Game.ini:/data/serverfiles/Mordhau/Saved/Config/LinuxServer/Game.ini:Z
 
   rust-server:
     image: ghcr.io/gameservermanagers/gameserver:rust
@@ -36,7 +36,7 @@ services:
       start_period: 30s
     volumes:
       - linuxgsm-rust:/data
-      - .serverdata/rust/common.cfg:/data/config-lgsm/rustserver/common.cfg
+      - .serverdata/rust/common.cfg:/data/config-lgsm/rustserver/common.cfg:Z
     network_mode: host
 
 volumes: