Fix bugs

Author: tsuzu

main.go

@@ -55,12 +55,30 @@ func main() {
 		m := make(map[string]palrcon.Player)
 
 		for _, player := range players {
-			m[player.SteamID] = player
+			if player.PlayerUID == "00000000" {
+				continue
+			}
+
+			m[player.PlayerUID] = player
 		}
 
 		return m
 	}
 
+	retriedBoarcast := func(message string) error {
+		var err error
+		for i := 0; i < 10; i++ {
+			err = palRCON.Broadcast(message)
+			if err != nil {
+				slog.Error("failed to broadcast", "error", err)
+				continue
+			}
+			return nil
+		}
+
+		return fmt.Errorf("failed to broadcast: %w", err)
+	}
+
 	for {
 		{
 			players, err := palRCON.GetPlayers()
@@ -80,23 +98,24 @@ func main() {
 			}
 
 			for _, player := range players {
-				if _, ok := prev[player.SteamID]; !ok {
-					err := palRCON.Broadcast(fmt.Sprintf("joined:%s", player.Name))
+				if _, ok := prev[player.PlayerUID]; !ok {
+					err := retriedBoarcast(fmt.Sprintf("joined:%s", player.Name))
 					if err != nil {
 						slog.Error("failed to broadcast", "error", err)
+						continue
 					}
 
 					slog.Info("Player joined", "player", player)
 				}
 			}
 			for _, player := range prev {
-				if _, ok := playersMap[player.SteamID]; !ok {
-					err := palRCON.Broadcast(fmt.Sprintf("left:%s", player.Name))
+				if _, ok := playersMap[player.PlayerUID]; !ok {
+					slog.Info("Player left", "player", player)
+
+					err := retriedBoarcast(fmt.Sprintf("left:%s", player.Name))
 					if err != nil {
 						slog.Error("failed to broadcast", "error", err)
 					}
-
-					slog.Info("Player left", "player", player)
 				}
 			}
 

pkg/palrcon/palrcon.go

@@ -55,7 +55,19 @@ func (p *palRCON) execute(command string) (string, error) {
 		return result, fmt.Errorf("failed to execute the command: %w", err)
 	}
 
-	return result, nil
+	if len(result) == 0 {
+		return result, nil
+	}
+
+	raw := []byte(result)
+	i := len(raw)
+	for ; i > 0; i-- {
+		if raw[i-1] != 0 {
+			break
+		}
+	}
+
+	return string(raw[:i]), nil
 }
 
 func (p *palRCON) GetPlayers() ([]Player, error) {