Move controller sign-on time to ControlClient.SessionStats

(And renamed ControllerStats->SessionStats there.)

Author: mmp

main.go

@@ -258,10 +258,10 @@ func main() {
 				if ctrl, ok := controlClient.State.Controllers[id]; ok {
 					id += " (" + ctrl.Position + ")"
 				}
-				stats := controlClient.ControllerStats
+				stats := controlClient.SessionStats
 				SetDiscordStatus(DiscordStatus{
-					TotalDepartures: stats.Departures + stats.IntraFacility/2,
-					TotalArrivals:   stats.Arrivals + stats.IntraFacility/2,
+					TotalDepartures: stats.Departures + stats.IntraFacility,
+					TotalArrivals:   stats.Arrivals + stats.IntraFacility,
 					Position:        id,
 					Start:           mgr.ConnectionStartTime(),
 				}, config, lg)

pkg/aviation/aviation.go

@@ -186,7 +186,6 @@ type Controller struct {
 	ERAMFacility       bool      `json:"eram_facility"`   // To weed out N56 and N4P being the same fac
 	Facility           string    `json:"facility"`        // So we can get the STARS facility from a controller
 	DefaultAirport     string    `json:"default_airport"` // only required if CRDA is a thing
-	SignOnTime         time.Time
 }
 
 func (c Controller) Id() string {

pkg/panes/stars/lists.go

@@ -870,7 +870,8 @@ func (sp *STARSPane) drawSignOnList(ctx *panes.Context, pw [2]float32, style ren
 
 	var text strings.Builder
 	if ctrl := ctx.ControlClient.Controllers[ctx.ControlClient.PrimaryTCP]; ctrl != nil {
-		text.WriteString(ctx.ControlClient.PrimaryTCP + " " + ctrl.SignOnTime.UTC().Format("1504")) // TODO: initials
+		signOnTime := ctx.ControlClient.SessionStats.SignOnTime
+		text.WriteString(ctx.ControlClient.PrimaryTCP + " " + signOnTime.UTC().Format("1504")) // TODO: initials
 		td.AddText(text.String(), pw, style)
 	}
 }

pkg/server/client.go

@@ -29,11 +29,13 @@ type ControlClient struct {
 
 	pendingCalls []*util.PendingCall
 
-	ControllerStats struct {
+	SessionStats struct {
 		Departures    int
 		Arrivals      int
 		IntraFacility int
 		Overflights   int
+
+		SignOnTime time.Time
 	}
 
 	// This is all read-only data that we expect other parts of the system
@@ -46,7 +48,7 @@ func (c *ControlClient) RPCClient() *util.RPCClient {
 }
 
 func NewControlClient(ss sim.State, local bool, controllerToken string, client *util.RPCClient, lg *log.Logger) *ControlClient {
-	return &ControlClient{
+	cc := &ControlClient{
 		State:     ss,
 		lg:        lg,
 		remoteSim: !local,
@@ -56,13 +58,15 @@ func NewControlClient(ss sim.State, local bool, controllerToken string, client *
 		},
 		lastUpdateRequest: time.Now(),
 	}
+	cc.SessionStats.SignOnTime = ss.SimTime
+	return cc
 }
 
 func (c *ControlClient) Status() string {
 	if c == nil || c.SimDescription == "" {
 		return "[disconnected]"
 	} else {
-		stats := c.ControllerStats
+		stats := c.SessionStats
 		deparr := fmt.Sprintf(" [ %d departures %d arrivals %d intrafacility %d overflights ]",
 			stats.Departures, stats.Arrivals, stats.IntraFacility, stats.Overflights)
 		return c.State.PrimaryTCP + c.SimDescription + deparr
@@ -231,13 +235,13 @@ func (c *ControlClient) updateControllerStats(callsign string, next func(any)) f
 	return func(result any) {
 		if ac, ok := c.State.Aircraft[callsign]; ok {
 			if c.IsIntraFacility(ac) {
-				c.ControllerStats.IntraFacility++
+				c.SessionStats.IntraFacility++
 			} else if c.IsDeparture(ac) {
-				c.ControllerStats.Departures++
+				c.SessionStats.Departures++
 			} else if c.IsArrival(ac) {
-				c.ControllerStats.Arrivals++
+				c.SessionStats.Arrivals++
 			} else if c.IsOverflight(ac) {
-				c.ControllerStats.Overflights++
+				c.SessionStats.Overflights++
 			}
 		}
 		if next != nil {

pkg/sim/sim.go

@@ -224,7 +224,6 @@ func (s *Sim) signOn(tcp string, instructor bool) error {
 
 	s.humanControllers[tcp] = s.eventStream.Subscribe()
 	s.State.Controllers[tcp] = s.SignOnPositions[tcp]
-	s.State.Controllers[tcp].SignOnTime = s.State.SimTime
 	s.State.HumanControllers = append(s.State.HumanControllers, tcp)
 
 	if tcp == s.State.PrimaryController {