Remove timeout from advantage response

Author: g3force

cmd/ssl-team-client/main.go

@@ -62,12 +62,10 @@ func main() {
 	c.sendDesiredKeeper(3)
 
 	for {
-		for i := 0; i < 30; i++ {
-			c.ReplyToChoices()
-			time.Sleep(time.Millisecond * 100)
-		}
-		log.Print("Waiting")
-		time.Sleep(time.Millisecond * 2000)
+		c.SendAdvantageChoice(rcon.AdvantageResponse_CONTINUE)
+		time.Sleep(time.Millisecond * 1000)
+		c.SendAdvantageChoice(rcon.AdvantageResponse_STOP)
+		time.Sleep(time.Millisecond * 1000)
 	}
 }
 
@@ -121,8 +119,8 @@ func (c *Client) sendDesiredKeeper(id int32) (accepted bool) {
 	return c.sendRequest(&request)
 }
 
-func (c *Client) ReplyToChoices() {
-	reply := rcon.TeamToController_AdvantageResponse{AdvantageResponse: rcon.AdvantageResponse_CONTINUE}
+func (c *Client) SendAdvantageChoice(choice rcon.AdvantageResponse) {
+	reply := rcon.TeamToController_AdvantageResponse{AdvantageResponse: choice}
 	response := rcon.TeamToController{Msg: &reply}
 	c.sendRequest(&response)
 }

config/ssl-game-controller.yaml

@@ -50,7 +50,6 @@ game:
   continue-from-halt: false
   challenge-flags: 3
   emergency-stop-grace-period: 10s
-  advantage-response-timeout: 1s
   normal:
     half-duration: 5m
     half-time-duration: 5m

internal/app/config/config.go

@@ -62,7 +62,6 @@ type Game struct {
 	ContinueFromHalt                      bool                       `yaml:"continue-from-halt"`
 	ChallengeFlags                        int32                      `yaml:"challenge-flags"`
 	EmergencyStopGracePeriod              time.Duration              `yaml:"emergency-stop-grace-period"`
-	AdvantageResponseTimeout              time.Duration              `yaml:"advantage-response-timeout"`
 }
 
 // Network holds configs for network communication
@@ -194,7 +193,6 @@ func DefaultControllerConfig() (c Controller) {
 	c.Game.AutoApproveGoals = false
 	c.Game.ChallengeFlags = 3
 	c.Game.EmergencyStopGracePeriod = 10 * time.Second
-	c.Game.AdvantageResponseTimeout = 500 * time.Millisecond
 
 	c.Game.Normal.HalfDuration = 5 * time.Minute
 	c.Game.Normal.HalfTimeDuration = 5 * time.Minute

internal/app/config/testdata/config.yaml

@@ -49,7 +49,6 @@ game:
   continue-from-halt: false
   challenge-flags: 3
   emergency-stop-grace-period: 10s
-  advantage-response-timeout: 1s
   normal:
     half-duration: 5m
     half-time-duration: 5m

internal/app/engine/process_team_advantage.go

@@ -12,13 +12,6 @@ func (e *Engine) processTeamAdvantageResponse() {
 			e.gcState.TeamState[team.String()].LastAdvantageResponse = &TeamAdvantageResponse{
 				Response: &defaultResponse,
 			}
-		} else if advantageResponse.Timestamp != nil {
-			age := e.lastTimeUpdate.Sub(advantageResponse.Timestamp.AsTime())
-			if age > e.gameConfig.AdvantageResponseTimeout {
-				// reset
-				advantageResponse.Timestamp = nil
-				advantageResponse.Response = &defaultResponse
-			}
 		}
 	}
 }

internal/app/engine/ssl_gc_engine.pb.go

@@ -8,7 +8,6 @@ import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/statemachine"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
-	"google.golang.org/protobuf/types/known/timestamppb"
 	"io"
 	"log"
 	"net"
@@ -117,6 +116,7 @@ func (s *TeamServer) handleClientConnection(conn net.Conn) {
 				connected := false
 				teamState.Connected = &connected
 				teamState.ConnectionVerified = &connected
+				teamState.LastAdvantageResponse = nil
 			} else {
 				log.Println("Team not connected: " + client.team.String())
 			}
@@ -184,8 +184,7 @@ func (s *TeamServer) processRequest(teamClient TeamClient, request *TeamToContro
 		}
 		s.gcEngine.UpdateGcState(func(gcState *engine.GcState) {
 			gcState.TeamState[teamClient.team.String()].LastAdvantageResponse = &engine.TeamAdvantageResponse{
-				Response:  &responseType,
-				Timestamp: timestamppb.New(s.gcEngine.GetLastTimeUpdate()),
+				Response: &responseType,
 			}
 		})
 		// exit early to avoid spamming the log