.goreleaser.yaml

@@ -22,7 +22,6 @@ builds:
     goos:
       - linux
       - windows
-      - darwin
     goarch:
       - amd64
 

CHANGELOG.md

@@ -11,18 +11,6 @@ Before any major/minor/patch bump all unit tests will be run to verify they pass
 
 -   [x]
 
-# [0.4.0] - 2026-02-15
-
-### Added
-
-- macos build to releases
-
-### Changed
-
-- exitOnError() removed in favour of a [deferred exit function](https://github.com/onyx-and-iris/q3rcon/blob/cd15e8983726177d6edd985a8bf3d7f4e0d7f346/cmd/q3rcon/main.go#L21), this ensures the closer() cleanup function is always called.
-- the included CLI now uses a [timeouts map](https://github.com/onyx-and-iris/q3rcon/blob/cd15e8983726177d6edd985a8bf3d7f4e0d7f346/cmd/q3rcon/main.go#L109).
-    -   even though this is only an example implementation it should still be basically usable.
-
 # [0.3.0] - 2025-04-05
 
 ### Changed

Taskfile.yml

@@ -8,8 +8,8 @@ vars:
   WINDOWS: '{{.BIN_DIR}}/{{.PROGRAM}}_windows_amd64.exe'
   LINUX: '{{.BIN_DIR}}/{{.PROGRAM}}_linux_amd64'
   MACOS: '{{.BIN_DIR}}/{{.PROGRAM}}_darwin_amd64'
-  VERSION:
+  GIT_COMMIT:
-    sh: 'git describe --tags $(git rev-list --tags --max-count=1)'
+    sh: git log -n 1 --format=%h
 
 tasks:
   default:
@@ -39,19 +39,19 @@ tasks:
   build-windows:
     desc: Build the q3rcon project for Windows
     cmds:
-      - GOOS=windows GOARCH=amd64 go build -o {{.WINDOWS}} -ldflags="-X main.version={{.VERSION}}" ./cmd/{{.PROGRAM}}/
+      - GOOS=windows GOARCH=amd64 go build -o {{.WINDOWS}} -ldflags="-X main.Version={{.GIT_COMMIT}}" ./cmd/{{.PROGRAM}}/
     internal: true
 
   build-linux:
     desc: Build the q3rcon project for Linux
     cmds:
-      - GOOS=linux GOARCH=amd64 go build -o {{.LINUX}} -ldflags="-X main.version={{.VERSION}}" ./cmd/{{.PROGRAM}}/
+      - GOOS=linux GOARCH=amd64 go build -o {{.LINUX}} -ldflags="-X main.Version={{.GIT_COMMIT}}" ./cmd/{{.PROGRAM}}/
     internal: true
 
   build-macos:
     desc: Build the q3rcon project for macOS
     cmds:
-      - GOOS=darwin GOARCH=amd64 go build -o {{.MACOS}} -ldflags="-X main.version={{.VERSION}}" ./cmd/{{.PROGRAM}}/
+      - GOOS=darwin GOARCH=amd64 go build -o {{.MACOS}} -ldflags="-X main.Version={{.GIT_COMMIT}}" ./cmd/{{.PROGRAM}}/
     internal: true
 
   test:

cmd/q3rcon/main.go

@@ -6,64 +6,33 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"runtime/debug"
 	"strings"
-	"time"
-
-	"github.com/charmbracelet/log"
 
 	"github.com/onyx-and-iris/q3rcon"
+
+	log "github.com/sirupsen/logrus"
 )
 
-var version string // Version will be set at build time
+func exitOnError(err error) {
-
+	_, _ = fmt.Fprintf(os.Stderr, "Error: %s\n", err)
-func main() {
+	os.Exit(1)
-	var exitCode int
-
-	// Defer exit with the final exit code
-	defer func() {
-		if exitCode != 0 {
-			os.Exit(exitCode)
-		}
-	}()
-
-	closer, err := run()
-	if closer != nil {
-		defer closer()
-	}
-	if err != nil {
-		log.Error(err)
-		exitCode = 1
-	}
 }
 
-// run executes the main logic of the application and returns a cleanup function and an error if any.
+func main() {
-func run() (func(), error) {
 	var (
 		host        string
 		port        int
 		rconpass    string
 		interactive bool
 		loglevel    string
-		versionFlag bool
 	)
 
 	flag.StringVar(&host, "host", "localhost", "hostname of the gameserver")
 	flag.StringVar(&host, "h", "localhost", "hostname of the gameserver (shorthand)")
 	flag.IntVar(&port, "port", 28960, "port on which the gameserver resides, default is 28960")
-	flag.IntVar(
+	flag.IntVar(&port, "p", 28960, "port on which the gameserver resides, default is 28960 (shorthand)")
-		&port,
-		"p",
-		28960,
-		"port on which the gameserver resides, default is 28960 (shorthand)",
-	)
 	flag.StringVar(&rconpass, "rconpass", os.Getenv("RCON_PASS"), "rcon password of the gameserver")
-	flag.StringVar(
+	flag.StringVar(&rconpass, "r", os.Getenv("RCON_PASS"), "rcon password of the gameserver (shorthand)")
-		&rconpass,
-		"r",
-		os.Getenv("RCON_PASS"),
-		"rcon password of the gameserver (shorthand)",
-	)
 
 	flag.BoolVar(&interactive, "interactive", false, "run in interactive mode")
 	flag.BoolVar(&interactive, "i", false, "run in interactive mode")
@@ -71,94 +40,57 @@ func run() (func(), error) {
 	flag.StringVar(&loglevel, "loglevel", "warn", "log level")
 	flag.StringVar(&loglevel, "l", "warn", "log level (shorthand)")
 
-	flag.BoolVar(&versionFlag, "version", false, "print version information and exit")
-	flag.BoolVar(&versionFlag, "v", false, "print version information and exit (shorthand)")
-
 	flag.Parse()
 
-	if versionFlag {
-		fmt.Printf("q3rcon version: %s\n", versionFromBuild())
-		return nil, nil
-	}
-
 	level, err := log.ParseLevel(loglevel)
 	if err != nil {
-		return nil, fmt.Errorf("invalid log level: %s", loglevel)
+		exitOnError(fmt.Errorf("invalid log level: %s", loglevel))
 	}
 	log.SetLevel(level)
 
 	if port < 1024 || port > 65535 {
-		return nil, fmt.Errorf("invalid port value, got: (%d) expected: in range 1024-65535", port)
+		exitOnError(fmt.Errorf("invalid port value, got: (%d) expected: in range 1024-65535", port))
 	}
 
 	if len(rconpass) < 8 {
-		return nil, fmt.Errorf(
+		exitOnError(fmt.Errorf("invalid rcon password, got: (%s) expected: at least 8 characters", rconpass))
-			"invalid rcon password, got: (%s) expected: at least 8 characters",
-			rconpass,
-		)
 	}
 
-	client, closer, err := connectRcon(host, port, rconpass)
+	rcon, err := connectRcon(host, port, rconpass)
 	if err != nil {
-		return nil, fmt.Errorf("failed to connect to rcon: %w", err)
+		exitOnError(err)
+	}
+	defer rcon.Close()
+
+	if !interactive {
+		runCommands(flag.Args(), rcon)
+		return
 	}
 
-	if interactive {
 	fmt.Printf("Enter 'Q' to exit.\n>> ")
-		err := interactiveMode(client, os.Stdin)
+	err = interactiveMode(rcon, os.Stdin)
 	if err != nil {
-			return closer, fmt.Errorf("interactive mode error: %w", err)
+		exitOnError(err)
 	}
-		return closer, nil
-	}
-
-	commands := flag.Args()
-	if len(commands) == 0 {
-		log.Debug("no commands provided, defaulting to 'status'")
-		commands = append(commands, "status")
-	}
-	runCommands(client, commands)
-
-	return closer, nil
 }
 
-// versionFromBuild retrieves the version information from the build metadata.
+func connectRcon(host string, port int, password string) (*q3rcon.Rcon, error) {
-func versionFromBuild() string {
+	rcon, err := q3rcon.New(host, port, password)
-	if version != "" {
-		return version
-	}
-
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return "(unable to read version)"
-	}
-	return strings.Split(info.Main.Version, "-")[0]
-}
-
-func connectRcon(host string, port int, password string) (*q3rcon.Rcon, func(), error) {
-	client, err := q3rcon.New(host, port, password, q3rcon.WithTimeouts(map[string]time.Duration{
-		"map":         time.Second,
-		"map_rotate":  time.Second,
-		"map_restart": time.Second,
-	}))
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-
+	return rcon, nil
-	closer := func() {
-		if err := client.Close(); err != nil {
-			log.Error(err)
-		}
-	}
-
-	return client, closer, nil
 }
 
 // runCommands runs the commands given in the flag.Args slice.
 // If no commands are given, it defaults to running the "status" command.
-func runCommands(client *q3rcon.Rcon, commands []string) {
+func runCommands(commands []string, rcon *q3rcon.Rcon) {
+	if len(commands) == 0 {
+		commands = append(commands, "status")
+	}
+
 	for _, cmd := range commands {
-		resp, err := client.Send(cmd)
+		resp, err := rcon.Send(cmd)
 		if err != nil {
 			log.Error(err)
 			continue
@@ -168,7 +100,7 @@ func runCommands(client *q3rcon.Rcon, commands []string) {
 }
 
 // interactiveMode continuously reads from input until a quit signal is given.
-func interactiveMode(client *q3rcon.Rcon, input io.Reader) error {
+func interactiveMode(rcon *q3rcon.Rcon, input io.Reader) error {
 	scanner := bufio.NewScanner(input)
 	for scanner.Scan() {
 		cmd := scanner.Text()
@@ -176,7 +108,7 @@ func interactiveMode(client *q3rcon.Rcon, input io.Reader) error {
 			return nil
 		}
 
-		resp, err := client.Send(cmd)
+		resp, err := rcon.Send(cmd)
 		if err != nil {
 			log.Error(err)
 			continue

go.mod

@@ -1,26 +1,7 @@
 module github.com/onyx-and-iris/q3rcon
 
-go 1.25.0
+go 1.23.0
 
-require (
+require github.com/sirupsen/logrus v1.9.3
-	github.com/charmbracelet/log v0.4.2
-	github.com/sirupsen/logrus v1.9.3
-)
 
-require (
+require golang.org/x/sys v0.34.0 // indirect
-	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
-	github.com/charmbracelet/lipgloss v1.1.0 // indirect
-	github.com/charmbracelet/x/ansi v0.8.0 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/muesli/termenv v0.16.0 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/sys v0.34.0 // indirect
-)

go.sum

@@ -1,50 +1,16 @@
-github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
-github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
-github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
-github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
-github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
-github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
-github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
-github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
-github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
-github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
 golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

makefile

@@ -6,7 +6,7 @@ BIN_DIR := bin
 WINDOWS=$(BIN_DIR)/$(PROGRAM)_windows_amd64.exe
 LINUX=$(BIN_DIR)/$(PROGRAM)_linux_amd64
 MACOS=$(BIN_DIR)/$(PROGRAM)_darwin_amd64
-VERSION=$(shell git describe --tags $(shell git rev-list --tags --max-count=1))
+VERSION=$(shell git log -n 1 --format=%h)
 
 .DEFAULT_GOAL := build
 

q3rcon.go

@@ -140,6 +140,6 @@ func (r Rcon) listen(timeout time.Duration, respChan chan<- string, errChan chan
 	}
 }
 
-func (r Rcon) Close() error {
+func (r Rcon) Close() {
-	return r.conn.Close()
+	r.conn.Close()
 }