fix bugs related to vendoring

This commit is contained in:
steven carpenter 2025-06-30 17:13:05 -04:00
parent 4fe975eb07
commit 1bd5ed6df6
3 changed files with 60 additions and 11 deletions

5
go.mod
View file

@ -1,2 +1,3 @@
module git.skdevstudios.com/specCon18/reforgerds-updater module git.skdevstudios.com/specCon18/reforgerds-updater
go 1.16
go 1.18

View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"time" "time"
"reforgerds-updater/internal/bread" "git.skdevstudios.com/specCon18/reforgerds-updater/internal/a2s/bread"
) )
// https://developer.valvesoftware.com/wiki/Server_queries#Response_Format_2 // https://developer.valvesoftware.com/wiki/Server_queries#Response_Format_2

64
main.go
View file

@ -8,6 +8,8 @@ import (
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
"time"
"git.skdevstudios.com/specCon18/reforgerds-updater/internal/a2s" "git.skdevstudios.com/specCon18/reforgerds-updater/internal/a2s"
) )
@ -18,9 +20,13 @@ type Update struct {
} }
const ( const (
updateURL = "http://127.0.0.1:3000/updates" updateURL = "http://127.0.0.1:3000/updates"
stateFilePath = "latest_version.txt" stateFilePath = "latest_version.txt"
serverIP = "127.0.0.1"
serverPort = 17777
) )
func main() { func main() {
resp, err := http.Get(updateURL) resp, err := http.Get(updateURL)
if err != nil { if err != nil {
@ -59,19 +65,38 @@ func main() {
if versionCompare(latest, prevVersion) > 0 { if versionCompare(latest, prevVersion) > 0 {
fmt.Printf("New version found! %s > %s\n", latest, prevVersion) fmt.Printf("New version found! %s > %s\n", latest, prevVersion)
// Run steamcmd with reforger_update script // Always update the state file
fmt.Println("Running update command...") err := os.WriteFile(stateFilePath, []byte(latest), 0644)
if err != nil {
fmt.Printf("Failed to write version file: %v\n", err)
}
// Check for online players
players, err := fetchPlayers(serverIP, serverPort)
if err != nil {
fmt.Printf("Error checking players: %v\n", err)
return
}
if len(players) > 0 {
fmt.Printf("Players are currently online (%d):\n", len(players))
for _, p := range players {
fmt.Printf("- %-16s | Score: %d | Time: %s\n", p.Name, p.Score, formatDuration(p.Duration))
}
fmt.Println("Skipping update while players are online.")
return
}
// No players — run steamcmd
fmt.Println("No players online. Running update command...")
cmd := exec.Command("./steamcmd.sh", "+runscript", "reforger_update") cmd := exec.Command("./steamcmd.sh", "+runscript", "reforger_update")
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
err := cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
fmt.Printf("Update command failed: %v\n", err) fmt.Printf("Update command failed: %v\n", err)
return return
} }
// Store the new latest version
_ = os.WriteFile(stateFilePath, []byte(latest), 0644)
} else { } else {
fmt.Printf("No new version. Latest seen: %s\n", prevVersion) fmt.Printf("No new version. Latest seen: %s\n", prevVersion)
} }
@ -105,3 +130,26 @@ func versionCompare(a, b string) int {
return 0 return 0
} }
func fetchPlayers(ip string, port int) ([]a2s.Player, error) {
client, err := a2s.New(ip, port)
if err != nil {
return nil, fmt.Errorf("create client: %w", err)
}
defer client.Close()
client.SetBufferSize(2048)
client.SetDeadlineTimeout(3)
players, err := client.GetPlayers()
if err != nil {
return nil, fmt.Errorf("get players: %w", err)
}
return *players, nil
}
func formatDuration(d time.Duration) string {
minutes := int(d.Minutes())
seconds := int(d.Seconds()) % 60
return fmt.Sprintf("%02d:%02d", minutes, seconds)
}