From 19e94f036e13cbeedc02030a04040ab0d4ec7dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20B=C3=B6hm?= Date: Thu, 23 Sep 2021 15:58:56 +0200 Subject: [PATCH] basic flag support --- cmd/main.go | 55 +++++++---------- go.mod | 2 +- go.sum | 4 +- migrations/1_create_tables.up.sql | 6 ++ postgres/flag_store.go | 29 +++++++++ postgres/server_store.go | 14 ++--- postgres/store.go | 2 + steamServer.go | 19 ++++-- templates/home.html | 28 ++++++++- templates/region.html | 98 ------------------------------- web/handler.go | 28 ++++++++- 11 files changed, 134 insertions(+), 151 deletions(-) create mode 100644 postgres/flag_store.go delete mode 100644 templates/region.html diff --git a/cmd/main.go b/cmd/main.go index 7c9f7de..5c8bd23 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -3,26 +3,16 @@ package main import ( "log" "net/http" - "time" - "io/ioutil" - "encoding/json" "git.snrd.de/Spaenny/steamServer" "git.snrd.de/Spaenny/steamServer/postgres" "git.snrd.de/Spaenny/steamServer/web" + "github.com/rumblefrog/go-a2s" "github.com/robfig/cron/v3" ) -type Server struct { - AppID int `json:"AppID"` - Name string `json:"Name"` - Map string `json:"Map"` - Players int `json:"Players"` - MaxPlayers int `json:"MaxPlayers"` -} - func main() { - dsn := "postgres://postgres:secret@postgres:5432/postgres?sslmode=disable" + dsn := "postgres://postgres:secret@localhost:5432/postgres?sslmode=disable" store, err := postgres.NewStore(dsn) if err != nil { @@ -47,35 +37,32 @@ func main() { http.ListenAndServe(":3000", h) } -func updateServers(serverString string, store steamServer.Store) { - url := "http://steam-server-api:8080/server/" + serverString +func updateServers(host string, store steamServer.Store) { + client, err := a2s.NewClient(host) - reqClient := http.Client { - Timeout: time.Second * 10, - } - - req, err := http.NewRequest(http.MethodGet, url, nil) if err != nil { - log.Fatal(err) + log.Fatal("Creation of client failed: %w", err) + return } - res, err := reqClient.Do(req) + defer client.Close() + + info, err := client.QueryInfo() + if err != nil { - log.Fatal(err) + log.Printf("Querying failed: %s", err) + return } - if res.Body != nil { - defer res.Body.Close() + log.Printf("%s - %s\n", host, info.Name) + + server := steamServer.Server { + AppID: info.ID, + Name: info.Name, + Map: info.Map, + Players: info.Players, + MaxPlayers: info.MaxPlayers, } - body, err := ioutil.ReadAll(res.Body) - if err != nil { - log.Fatal(err) - } - - - server := steamServer.Server{} - json.Unmarshal([]byte(body), &server) - store.UpdateServerByQuery(&server, serverString) + store.UpdateServerByQuery(&server, host) } - diff --git a/go.mod b/go.mod index d8024f9..1949a36 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module git.snrd.de/Spaenny/steamServer go 1.17 require ( - git.snrd.de/Spaenny/steamserver v0.0.0-20210920125724-7e62f366e7e0 github.com/go-chi/chi v1.5.4 github.com/google/uuid v1.3.0 github.com/jmoiron/sqlx v1.3.4 github.com/lib/pq v1.10.3 github.com/robfig/cron/v3 v3.0.1 + github.com/rumblefrog/go-a2s v1.0.1 ) diff --git a/go.sum b/go.sum index 551aac0..150e3ae 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -git.snrd.de/Spaenny/steamserver v0.0.0-20210920125724-7e62f366e7e0 h1:b43+U83rjT0A+1k6MP5Muu/crGVzciaszaPGIFBXNow= -git.snrd.de/Spaenny/steamserver v0.0.0-20210920125724-7e62f366e7e0/go.mod h1:rl0ho92HJaP8HYnk2Fwqq4fWnFrVaolgiadz5iPqRWk= github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= @@ -15,3 +13,5 @@ github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRU github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/rumblefrog/go-a2s v1.0.1 h1:0M4QUDB1Tz00tCz36r/AWB4YFO2ajksvPnd7Abzz9SE= +github.com/rumblefrog/go-a2s v1.0.1/go.mod h1:JwbTgMTRGZcWzr3T2MUfDusrJU5Bdg8biEeZzPtN0So= diff --git a/migrations/1_create_tables.up.sql b/migrations/1_create_tables.up.sql index 6d2c36d..246b088 100644 --- a/migrations/1_create_tables.up.sql +++ b/migrations/1_create_tables.up.sql @@ -8,10 +8,16 @@ CREATE TABLE gamemodes ( name TEXT NOT NULL ); +CREATE TABLE flags ( + server_ip TEXT PRIMARY KEY, + flag VARCHAR(2) NULL DEFAULT NULL, +); + CREATE TABLE servers ( id UUID PRIMARY KEY, region_id UUID NOT NULL REFERENCES regions(id) ON DELETE CASCADE, gamemode_id UUID NOT NULL REFERENCES gamemodes(id) ON DELETE CASCADE, + server_id UUID NOT NULL REFERENCES flags(server_ip) ON DELETE CASCADE, app_id INT NOT NULL, server_ip TEXT NOT NULL, name TEXT NOT NULL, diff --git a/postgres/flag_store.go b/postgres/flag_store.go new file mode 100644 index 0000000..d955500 --- /dev/null +++ b/postgres/flag_store.go @@ -0,0 +1,29 @@ +package postgres + +import ( + "fmt" + + "git.snrd.de/Spaenny/steamServer" + "github.com/jmoiron/sqlx" +) + +type FlagStore struct { + *sqlx.DB +} + +func (s *FlagStore) Flag(server_ip string) (steamServer.Flag, error) { + var f steamServer.Flag + if err := s.Get(&f, `SELECT * FROM flags WHERE name = $1`, server_ip); err != nil { + return steamServer.Flag{}, fmt.Errorf("error getting flag id: %w", err) + } + return f, nil +} + +func (s *FlagStore) Flags() ([]steamServer.Flag, error) { + var ff []steamServer.Flag + var query = `SELECT * FROM flags` + if err := s.Select(&ff, query); err != nil { + return []steamServer.Flag{}, fmt.Errorf("error gettings flag: %w", err) + } + return ff, nil +} diff --git a/postgres/server_store.go b/postgres/server_store.go index ab353d8..9a435e6 100644 --- a/postgres/server_store.go +++ b/postgres/server_store.go @@ -22,7 +22,7 @@ func (s *ServerStore) Server(id uuid.UUID) (steamServer.Server, error) { func (s *ServerStore) Servers() ([]steamServer.Server, error) { var ss []steamServer.Server - var query = `SELECT * FROM servers` + var query = `SELECT * FROM servers ORDER BY name ASC` if err := s.Select(&ss, query); err != nil { return []steamServer.Server{}, fmt.Errorf("error gettings servers: %w", err) } @@ -32,18 +32,18 @@ func (s *ServerStore) Servers() ([]steamServer.Server, error) { func (s *ServerStore) ServersByRegion(regionID uuid.UUID) ([]steamServer.Server, error) { var ss []steamServer.Server var query = ` - SELECT * FROM servers WHERE region_id = $1` + SELECT * FROM servers WHERE region_id = $1 ORDER BY name ASC` if err := s.Select(&ss, query, regionID); err != nil { - return []steamServer.Server{}, fmt.Errorf("error gettings region servers: %w", err) + return []steamServer.Server{}, fmt.Errorf("error getting region servers: %w", err) } return ss, nil } func (s *ServerStore) ServersByRegionAndGamemode(regionID uuid.UUID, gamemodeID uuid.UUID) ([]steamServer.Server, error) { var ss []steamServer.Server - var query = `SELECT * FROM servers WHERE gamemode_id = $1 AND region_id = $2` + var query = `SELECT * FROM servers WHERE gamemode_id = $1 AND region_id = $2 ORDER BY name ASC` if err := s.Select(&ss, query, regionID, gamemodeID); err != nil { - return []steamServer.Server{}, fmt.Errorf("error gettings region servers: %w", err) + return []steamServer.Server{}, fmt.Errorf("error getting region and gamemode servers: %w", err) } return ss, nil } @@ -51,10 +51,10 @@ func (s *ServerStore) ServersByRegionAndGamemode(regionID uuid.UUID, gamemodeID func (s *ServerStore) ServersByGamemode(gamemodeID uuid.UUID) ([]steamServer.Server, error) { var ss []steamServer.Server - var query = `SELECT * FROM servers WHERE gamemode_id = $1` + var query = `SELECT * FROM servers WHERE gamemode_id = $1 ORDER BY name ASC` if err := s.Select(&ss, query, gamemodeID); err != nil { - return []steamServer.Server{}, fmt.Errorf("error gettings gamemode servers: %w", err) + return []steamServer.Server{}, fmt.Errorf("error getting gamemode servers: %w", err) } return ss, nil } diff --git a/postgres/store.go b/postgres/store.go index 7ed0fb3..2f03c9b 100644 --- a/postgres/store.go +++ b/postgres/store.go @@ -22,6 +22,7 @@ func NewStore(dataSourceName string) (*Store, error) { ServerStore: &ServerStore{DB: db}, RegionStore: &RegionStore{DB: db}, GamemodeStore: &GamemodeStore{DB: db}, + FlagStore: &FlagStore{DB: db}, }, nil } @@ -30,5 +31,6 @@ type Store struct { *ServerStore *RegionStore *GamemodeStore + *FlagStore } diff --git a/steamServer.go b/steamServer.go index acdc01d..83821eb 100644 --- a/steamServer.go +++ b/steamServer.go @@ -8,12 +8,12 @@ type Server struct { ID uuid.UUID `db:"id"` RegionID uuid.UUID `db:"region_id"` GamemodeID uuid.UUID `db:"gamemode_id"` - AppID int `db:"app_id"` + AppID uint16 `db:"app_id"` ServerIP string `db:"server_ip"` Name string `db:"name"` Map string `db:"map"` - Players int `db:"players"` - MaxPlayers int `db:"max_players"` + Players uint8 `db:"players"` + MaxPlayers uint8 `db:"max_players"` } type Region struct { @@ -26,6 +26,11 @@ type Gamemode struct { Name string `db:"name"` } +type Flag struct { + ServerIP string `db:"server_ip"` + Flag string `db:"flag"` +} + type ServerStore interface { Server(id uuid.UUID) (Server, error) Servers() ([]Server, error) @@ -40,14 +45,20 @@ type RegionStore interface { Region(name string) (Region, error) } - type GamemodeStore interface { Gamemode(name string) (Gamemode, error) Gamemodes() ([]Gamemode, error) } +type FlagStore interface { + Flag(server_ip string) (Flag, error) + Flags() ([]Flag, error) +} + + type Store interface { ServerStore RegionStore GamemodeStore + FlagStore } diff --git a/templates/home.html b/templates/home.html index a39e670..ab59725 100644 --- a/templates/home.html +++ b/templates/home.html @@ -3,6 +3,17 @@ +
@@ -44,10 +55,11 @@ {{ $gamemodes := .Gamemodes}} {{ $servers := .Servers}} + {{ $flags := .Flags}}
-

All Regions - Serverlist

+

{{.Region}}

{{range $gamemode := $gamemodes}}
@@ -55,6 +67,9 @@ + @@ -70,8 +85,15 @@ {{range $server := $servers}} {{if eq $gamemode.ID $server.GamemodeID}} - - + +
+ + {{$gamemode.Name}}
+
+ {{range $flag := $flags}} + {{if eq $server.ServerIP $flag.ServerIP}} + + {{end}} + {{end}} +
{{$server.Name}} diff --git a/templates/region.html b/templates/region.html deleted file mode 100644 index 30d5c77..0000000 --- a/templates/region.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - -
-
- -
-

All Regions

-
- -
-
- -
-

North America

-
- -
-
- -
-

Europe

-
- -
-
- -
-

Australia

-
- -
-
- -
-

Asia

-
- -
- - {{ $gamemodes := .Gamemodes}} - {{ $servers := .Servers}} -
-
-
-

{{.Region}}

-
- {{range $gamemode := $gamemodes}} -
-
- - - - - - - - - - - {{range $server := $servers}} - {{if eq $gamemode.ID $server.GamemodeID}} - - - - - - {{end}} - {{end}} - -
- {{$gamemode.Name}} - - Map - - Players -
-
-
- {{$server.Name}} -
-
- 		-

{{$server.Map}}

- 		-

{{$server.Players}}/{{$server.MaxPlayers}}

-
-
-
- {{end}} -
-
- - diff --git a/web/handler.go b/web/handler.go index 716247d..4d8e40f 100644 --- a/web/handler.go +++ b/web/handler.go @@ -32,8 +32,10 @@ type Handler struct { func (h *Handler) Home() http.HandlerFunc { type data struct { + Region string Servers []steamServer.Server Gamemodes []steamServer.Gamemode + Flags []steamServer.Flag } tmpl := template.Must(template.ParseFiles("templates/home.html")) @@ -49,9 +51,17 @@ func (h *Handler) Home() http.HandlerFunc { http.Error(w, err.Error(), http.StatusInternalServerError) } + + ff, err := h.store.Flags() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } + tmpl.Execute(w, data { + Region: "All Regions - Serverlist", Servers: ss, Gamemodes: gg, + Flags: ff, }) } } @@ -61,9 +71,10 @@ func (h *Handler) Europe() http.HandlerFunc { Region string Servers []steamServer.Server Gamemodes []steamServer.Gamemode + Flags []steamServer.Flag } - tmpl := template.Must(template.ParseFiles("templates/region.html")) + tmpl := template.Must(template.ParseFiles("templates/home.html")) return func(w http.ResponseWriter, r *http.Request) { reg, err := h.store.Region("Europe") if err != nil { @@ -81,11 +92,17 @@ func (h *Handler) Europe() http.HandlerFunc { http.Error(w, err.Error(), http.StatusInternalServerError) return } + + ff, err := h.store.Flags() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } tmpl.Execute(w, data { Region: "Europe", Servers: ss, Gamemodes: gg, + Flags: ff, }) } } @@ -97,9 +114,10 @@ func (h *Handler) America() http.HandlerFunc { Region string Servers []steamServer.Server Gamemodes []steamServer.Gamemode + Flags []steamServer.Flag } - tmpl := template.Must(template.ParseFiles("templates/region.html")) + tmpl := template.Must(template.ParseFiles("templates/home.html")) return func(w http.ResponseWriter, r *http.Request) { reg, err := h.store.Region("North America") if err != nil { @@ -118,10 +136,16 @@ func (h *Handler) America() http.HandlerFunc { return } + ff, err := h.store.Flags() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } + tmpl.Execute(w, data { Region: "North America", Servers: ss, Gamemodes: gg, + Flags: ff, }) } }