.dockerignore

@@ -1,6 +1,6 @@
 *
 !cmd/
-!*.go
+!pkg/
 
 !go.mod
 !go.sum

.vscode/launch.json

@@ -9,9 +9,9 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "${workspaceFolder}/cmd/q3rcon-proxy/",
+            "program": "${workspaceFolder}/cmd/q3rcon-proxy/main.go",
             "env": {
-                "Q3RCON_PORTS_MAPPING": "28961:28960",
+                "Q3RCON_PROXY": "28961:28960",
             }
         }
     ]

cmd/q3rcon-proxy/main.go

@@ -4,16 +4,14 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 
-	udpproxy "github.com/onyx-and-iris/q3rcon-proxy"
+	"github.com/onyx-and-iris/q3rcon-proxy/pkg/udpproxy"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v3"
 )
 
-// proxyConfig holds the configuration for a single UDP proxy server.
 type proxyConfig struct {
 	proxyHost      string
 	targetHost     string
@@ -34,7 +32,7 @@ func main() {
 			},
 			&cli.StringFlag{
 				Name:    "target-host",
-				Value:   "localhost",
+				Value:   "127.0.0.1",
 				Usage:   "Target host address",
 				Sources: cli.EnvVars("Q3RCON_TARGET_HOST"),
 			},
@@ -43,27 +41,6 @@ func main() {
 				Usage:    "Proxy and target ports (proxy:target)",
 				Sources:  cli.EnvVars("Q3RCON_PORTS_MAPPING"),
 				Required: true,
-				Action: func(ctx context.Context, cmd *cli.Command, v string) error {
-					// Validate the ports mapping
-					for mapping := range strings.SplitSeq(v, ";") {
-						ports := strings.Split(mapping, ":")
-						if len(ports) != 2 {
-							return fmt.Errorf("invalid ports mapping: %s", mapping)
-						}
-						proxyPort, err := strconv.Atoi(ports[0])
-						if err != nil || proxyPort < 1 || proxyPort > 65535 {
-							return fmt.Errorf("invalid proxy port: %s", ports[0])
-						}
-						targetPort, err := strconv.Atoi(ports[1])
-						if err != nil || targetPort < 1 || targetPort > 65535 {
-							return fmt.Errorf("invalid target port: %s", ports[1])
-						}
-						if proxyPort == targetPort {
-							return fmt.Errorf("proxy and target ports cannot be the same: %s", mapping)
-						}
-					}
-					return nil
-				},
 			},
 			&cli.IntFlag{
 				Name:    "session-timeout",
@@ -78,14 +55,6 @@ func main() {
 				Sources: cli.EnvVars("Q3RCON_LOGLEVEL"),
 			},
 		},
-		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
-			logLevel, err := log.ParseLevel(cmd.String("loglevel"))
-			if err != nil {
-				return ctx, fmt.Errorf("invalid log level: %w", err)
-			}
-			log.SetLevel(logLevel)
-			return ctx, nil
-		},
 		Action: func(_ context.Context, cmd *cli.Command) error {
 			errChan := make(chan error)
 
@@ -97,28 +66,32 @@ func main() {
 					sessionTimeout: cmd.Int("session-timeout"),
 				}
 
-				go launchProxy(cfg, errChan)
+				go initProxy(cfg, errChan)
 			}
 
-			// Under normal circumstances, the main goroutine will block here.
-			// If we receive an error we will log it and exit
-			return <-errChan
+			// We don't expect to receive any errors from the channels, but if we do, we log and return early.
+			for err := range errChan {
+				if err != nil {
+					log.Errorf("Error: %v", err)
+					return err
+				}
+			}
+			return nil
 		},
 	}
 
-	log.Fatal(cmd.Run(context.Background(), os.Args))
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
+		log.Fatal(err)
+	}
 }
 
-// launchProxy initializes the UDP proxy server with the given configuration.
-// It listens on the specified proxy host and port, and forwards traffic to the target host and port.
-// server.ListenAndServe blocks until the server is stopped or an error occurs.
-func launchProxy(cfg proxyConfig, errChan chan<- error) {
+func initProxy(cfg proxyConfig, errChan chan error) {
 	proxyPort, targetPort := cfg.portsMapping[0], cfg.portsMapping[1]
 
 	hostAddr := fmt.Sprintf("%s:%s", cfg.proxyHost, proxyPort)
 	proxyAddr := fmt.Sprintf("%s:%s", cfg.targetHost, targetPort)
 
-	server, err := udpproxy.New(
+	c, err := udpproxy.New(
 		hostAddr, proxyAddr,
 		udpproxy.WithSessionTimeout(time.Duration(cfg.sessionTimeout)*time.Minute))
 	if err != nil {
@@ -128,5 +101,5 @@ func launchProxy(cfg proxyConfig, errChan chan<- error) {
 
 	log.Printf("q3rcon-proxy initialized: [proxy] (%s) [target] (%s)", hostAddr, proxyAddr)
 
-	errChan <- server.ListenAndServe()
+	errChan <- c.ListenAndServe()
 }

cmd/q3rcon-proxy/util.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"os"
+	"strconv"
+)
+
+func getEnvInt(key string) (int, error) {
+	s := os.Getenv(key)
+	if s == "" {
+		return 0, nil
+	}
+	v, err := strconv.Atoi(s)
+	if err != nil {
+		return 0, err
+	}
+	return v, nil
+}

debian/q3rcon-proxy.service

@@ -6,9 +6,9 @@ After=network.target
 [Service]
 Type=simple
 User=gameservers
-Environment="Q3RCON_PORTS_MAPPING=20000:28960;20001:28961;20002:28962"
+Environment="Q3RCON_PROXY=20000:28960;20001:28961;20002:28962"
 Environment="Q3RCON_HOST=0.0.0.0"
-Environment="Q3RCON_LOGLEVEL=info"
+Environment="Q3RCON_DEBUG=0"
 
 ExecStart=/usr/local/bin/q3rcon-proxy
 Restart=always

go.mod

@@ -6,7 +6,7 @@ toolchain go1.24.1
 
 require (
 	github.com/sirupsen/logrus v1.9.3
-	github.com/urfave/cli/v3 v3.3.3
+	github.com/urfave/cli/v3 v3.3.2
 )
 
-require golang.org/x/sys v0.33.0 // indirect
+require golang.org/x/sys v0.32.0 // indirect

go.sum

@@ -9,11 +9,11 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 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/urfave/cli/v3 v3.3.3 h1:byCBaVdIXuLPIDm5CYZRVG6NvT7tv1ECqdU4YzlEa3I=
-github.com/urfave/cli/v3 v3.3.3/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
+github.com/urfave/cli/v3 v3.3.2 h1:BYFVnhhZ8RqT38DxEYVFPPmGFTEf7tJwySTXsVRrS/o=
+github.com/urfave/cli/v3 v3.3.2/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

option.go

@@ -1,22 +0,0 @@
-package udpproxy
-
-import (
-	"time"
-
-	log "github.com/sirupsen/logrus"
-)
-
-// Option is a functional option type that allows us to configure the Client.
-type Option func(*Client)
-
-// WithSessionTimeout is a functional option to set the session timeout
-func WithSessionTimeout(timeout time.Duration) Option {
-	return func(c *Client) {
-		if timeout < time.Minute {
-			log.Warnf("cannot set stale session timeout to less than 1 minute.. defaulting to 20 minutes")
-			return
-		}
-
-		c.sessionTimeout = timeout
-	}
-}

pkg/udpproxy/udpproxy.go

@@ -7,6 +7,21 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// Option is a functional option type that allows us to configure the Client.
+type Option func(*Client)
+
+// WithSessionTimeout is a functional option to set the session timeout
+func WithSessionTimeout(timeout time.Duration) Option {
+	return func(c *Client) {
+		if timeout < time.Minute {
+			log.Warnf("cannot set stale session timeout to less than 1 minute.. defaulting to 20 minutes")
+			return
+		}
+
+		c.sessionTimeout = timeout
+	}
+}
+
 type Client struct {
 	laddr *net.UDPAddr
 	raddr *net.UDPAddr