refactor: bundle config for connector

Author: alexfrs69

cmd/mc-router/main.go

@@ -155,7 +155,18 @@ func main() {
 		trustedIpNets = append(trustedIpNets, ipNet)
 	}
 
-	connector := server.NewConnector(metricsBuilder.BuildConnectorMetrics(), config.UseProxyProtocol, config.ReceiveProxyProtocol, trustedIpNets, config.RecordLogins, autoScaleUpAllowDenyConfig, config.FakeOnline, config.FakeOnlineMOTD)
+	connectorConfig := server.ConnectorConfig{
+		SendProxyProto:     config.UseProxyProtocol,
+		ReceiveProxyProto: config.ReceiveProxyProtocol,
+		TrustedProxyNets:       trustedIpNets,
+		RecordLogins:         config.RecordLogins,
+		AutoScaleUpAllowDenyConfig: autoScaleUpAllowDenyConfig,
+		AutoScaleUp:      config.AutoScaleUp,
+		FakeOnline:          config.FakeOnline,
+		FakeOnlineMOTD:      config.FakeOnlineMOTD,
+	}
+
+	connector := server.NewConnector(metricsBuilder.BuildConnectorMetrics(), connectorConfig)
 
 	clientFilter, err := server.NewClientFilter(config.ClientsToAllow, config.ClientsToDeny)
 	if err != nil {

server/connector.go

@@ -71,36 +71,35 @@ func (p *PlayerInfo) String() string {
 	return fmt.Sprintf("%s/%s", p.Name, p.Uuid)
 }
 
-func NewConnector(metrics *ConnectorMetrics, sendProxyProto bool, receiveProxyProto bool, trustedProxyNets []*net.IPNet, recordLogins bool, autoScaleUpAllowDenyConfig *AllowDenyConfig, fakeOnline bool, fakeOnlineMOTD string) *Connector {
+func NewConnector(metrics *ConnectorMetrics, cfg ConnectorConfig) *Connector {
 	return &Connector{
 		metrics:                    metrics,
-		sendProxyProto:             sendProxyProto,
 		connectionsCond:            sync.NewCond(&sync.Mutex{}),
-		receiveProxyProto:          receiveProxyProto,
-		trustedProxyNets:           trustedProxyNets,
-		recordLogins:               recordLogins,
-		autoScaleUpAllowDenyConfig: autoScaleUpAllowDenyConfig,
-		fakeOnline:      			fakeOnline,
-		fakeOnlineMOTD:             fakeOnlineMOTD,
+		config:                     cfg,
 	}
 }
 
+type ConnectorConfig struct {
+    SendProxyProto    bool
+    ReceiveProxyProto bool
+    TrustedProxyNets  []*net.IPNet
+    RecordLogins      bool
+    AutoScaleUpAllowDenyConfig *AllowDenyConfig
+	AutoScaleUp       bool
+    FakeOnline        bool
+    FakeOnlineMOTD    string
+}
+
 type Connector struct {
 	state             mcproto.State
 	metrics           *ConnectorMetrics
-	sendProxyProto    bool
-	receiveProxyProto bool
-	recordLogins      bool
-	trustedProxyNets  []*net.IPNet
 
 	activeConnections          int32
 	connectionsCond            *sync.Cond
 	ngrokToken                 string
 	clientFilter               *ClientFilter
-	autoScaleUpAllowDenyConfig *AllowDenyConfig
 
-	fakeOnline bool
-	fakeOnlineMOTD string
+	config 	ConnectorConfig
 
 	connectionNotifier ConnectionNotifier
 }
@@ -145,7 +144,7 @@ func (c *Connector) createListener(ctx context.Context, listenAddress string) (n
 	}
 	logrus.WithField("listenAddress", listenAddress).Info("Listening for Minecraft client connections")
 
-	if c.receiveProxyProto {
+	if c.config.ReceiveProxyProto {
 		proxyListener := &proxyproto.Listener{
 			Listener: listener,
 			Policy:   c.createProxyProtoPolicy(),
@@ -159,7 +158,7 @@ func (c *Connector) createListener(ctx context.Context, listenAddress string) (n
 
 func (c *Connector) createProxyProtoPolicy() func(upstream net.Addr) (proxyproto.Policy, error) {
 	return func(upstream net.Addr) (proxyproto.Policy, error) {
-		trustedIpNets := c.trustedProxyNets
+		trustedIpNets := c.config.TrustedProxyNets
 
 		if len(trustedIpNets) == 0 {
 			logrus.Debug("No trusted proxy networks configured, using the PROXY header by default")
@@ -361,8 +360,8 @@ func (c *Connector) findAndConnectBackend(ctx context.Context, frontendConn net.
 	clientAddr net.Addr, preReadContent io.Reader, serverAddress string, playerInfo *PlayerInfo, nextState mcproto.State) {
 
 	backendHostPort, resolvedHost, waker := Routes.FindBackendForServerAddress(ctx, serverAddress)
-	if waker != nil && nextState > mcproto.StateStatus {
-		serverAllowsPlayer := c.autoScaleUpAllowDenyConfig.ServerAllowsPlayer(serverAddress, playerInfo)
+	if c.config.AutoScaleUp && waker != nil && nextState > mcproto.StateStatus {
+		serverAllowsPlayer := c.config.AutoScaleUpAllowDenyConfig.ServerAllowsPlayer(serverAddress, playerInfo)
 		logrus.
 			WithField("client", clientAddr).
 			WithField("server", serverAddress).
@@ -414,7 +413,7 @@ func (c *Connector) findAndConnectBackend(ctx context.Context, frontendConn net.
 		case mcproto.StateLogin:
 			backendTry = retry.NewConstant(backendRetryInterval)
 			// Connect request: if autoscaler is enabled, try to connect until backendTimeout is reached
-			if waker != nil {
+			if c.config.AutoScaleUp {
 				// Autoscaler enabled: retry until backendTimeout is reached
 				backendTry = retry.WithMaxDuration(backendTimeout, backendTry)
 			} else {
@@ -456,11 +455,11 @@ func (c *Connector) findAndConnectBackend(ctx context.Context, frontendConn net.
 			}
 		}
 
-		if nextState == mcproto.StateStatus && c.fakeOnline && waker != nil {
+		if nextState == mcproto.StateStatus && c.config.FakeOnline && c.config.AutoScaleUp {
 			logrus.Info("Server is offline, sending fakeOnlineMOTD for status request")
 			writeStatusErr := mcproto.WriteStatusResponse(
 				frontendConn,
-				c.fakeOnlineMOTD,
+				c.config.FakeOnlineMOTD,
 			)
 
 			if writeStatusErr != nil {
@@ -488,7 +487,7 @@ func (c *Connector) findAndConnectBackend(ctx context.Context, frontendConn net.
 
 	c.metrics.ActiveConnections.Set(float64(
 		atomic.AddInt32(&c.activeConnections, 1)))
-	if c.recordLogins && playerInfo != nil {
+	if c.config.RecordLogins && playerInfo != nil {
 		logrus.
 			WithField("client", clientAddr).
 			WithField("player", playerInfo).
@@ -517,7 +516,7 @@ func (c *Connector) findAndConnectBackend(ctx context.Context, frontendConn net.
 		}
 		c.metrics.ActiveConnections.Set(float64(
 			atomic.AddInt32(&c.activeConnections, -1)))
-		if c.recordLogins && playerInfo != nil {
+		if c.config.RecordLogins && playerInfo != nil {
 			c.metrics.ServerActivePlayer.
 				With("player_name", playerInfo.Name).
 				With("player_uuid", playerInfo.Uuid.String()).
@@ -528,7 +527,7 @@ func (c *Connector) findAndConnectBackend(ctx context.Context, frontendConn net.
 	}()
 
 	// PROXY protocol implementation
-	if c.sendProxyProto {
+	if c.config.SendProxyProto {
 
 		// Determine transport protocol for the PROXY header by "analyzing" the frontend connection's address
 		transportProtocol := proxyproto.TCPv4