mirror of
https://github.com/jakejarvis/npqueue.git
synced 2026-07-26 09:36:03 -04:00
some clean-up
This commit is contained in:
@@ -1,177 +1,192 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ServerDetailsStruct struct {
|
type ServerDetailsStruct struct {
|
||||||
Players `json:"players"`
|
Players `json:"players"`
|
||||||
ServerQueue
|
ServerQueue
|
||||||
}
|
}
|
||||||
|
|
||||||
type ServerQueue struct {
|
type ServerQueue struct {
|
||||||
CurrentPlayers int64 `json:"currentPlayers"`
|
CurrentPlayers int64 `json:"currentPlayers"`
|
||||||
CurrentQueue int64 `json:"currentQueue"`
|
CurrentQueue int64 `json:"currentQueue"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Players []Player
|
type Players []Player
|
||||||
|
|
||||||
// Player details
|
// Player details
|
||||||
type Player struct {
|
type Player struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Identifiers []string `json:"identifiers"`
|
Identifiers []string `json:"identifiers"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Ping int64 `json:"ping"`
|
Ping int64 `json:"ping"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Nopixeldata []NoPixelPlayer
|
type Nopixeldata []NoPixelPlayer
|
||||||
|
|
||||||
type NoPixelPlayer struct {
|
type NoPixelPlayer struct {
|
||||||
ID int `json:"id"`
|
ID int `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
NoPixelID string `json:"noPixelID"`
|
NoPixelID string `json:"noPixelID"`
|
||||||
SteamID string `json:"steamID"`
|
SteamID string `json:"steamID"`
|
||||||
Twitch string `json:"twitch"`
|
Twitch string `json:"twitch"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
jsonGet = &http.Client{Timeout: 10 * time.Second}
|
jsonGet = &http.Client{Timeout: 10 * time.Second}
|
||||||
// Using an environment variable to protect IP
|
// Using an environment variable to protect IP
|
||||||
ServerAddress = os.Getenv("SERVER_IP")
|
ServerAddress = os.Getenv("SERVER_IP")
|
||||||
// ServerDetails struct to holds PlayerList & ServerDetails struct
|
// ServerDetails struct to hold PlayerList & ServerDetails struct
|
||||||
ServerDetails = &ServerDetailsStruct{}
|
ServerDetails = &ServerDetailsStruct{}
|
||||||
// NoPixelData struct
|
// NoPixelData struct
|
||||||
NoPixelData Nopixeldata
|
NoPixelData Nopixeldata
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetPlayerList sends HTTP get request to server to get list of players
|
// getPlayerList sends HTTP get request to get list of players from /players.json
|
||||||
func getPlayerList() (err error) {
|
func getPlayerList() (err error) {
|
||||||
server := strings.Builder{}
|
server := strings.Builder{}
|
||||||
fmt.Fprintf(&server, "http://%s/players.json", ServerAddress)
|
fmt.Fprintf(&server, "http://%s/players.json", ServerAddress)
|
||||||
req, err := jsonGet.Get(server.String())
|
|
||||||
if err != nil {
|
req, err := jsonGet.Get(server.String())
|
||||||
return err
|
if err != nil {
|
||||||
}
|
return err
|
||||||
defer req.Body.Close()
|
}
|
||||||
err = json.NewDecoder(req.Body).Decode(&ServerDetails.Players)
|
defer req.Body.Close()
|
||||||
if err != nil {
|
|
||||||
return err
|
err = json.NewDecoder(req.Body).Decode(&ServerDetails.Players)
|
||||||
}
|
if err != nil {
|
||||||
return
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetServerQueueDetails opens UDP socket to FiveM Server and current players and queue from server details
|
// getServerQueue opens UDP socket to get queue count
|
||||||
func getServerQueueDetails() (err error) {
|
func getServerQueue() (err error) {
|
||||||
serverData := make([]byte, 256)
|
serverData := make([]byte, 256)
|
||||||
serverConnection, err := net.Dial("udp", ServerAddress)
|
serverConnection, err := net.Dial("udp", ServerAddress)
|
||||||
defer serverConnection.Close()
|
defer serverConnection.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Fprintf(serverConnection, "\xFF\xFF\xFF\xFFgetinfo f")
|
|
||||||
_, err = bufio.NewReader(serverConnection).Read(serverData)
|
|
||||||
|
|
||||||
if err == nil {
|
// UDP voodoo to get server info -- https://github.com/LiquidObsidian/fivereborn-query/blob/master/index.js#L54
|
||||||
serverData := bytes.Split(serverData, []byte("\n"))
|
fmt.Fprintf(serverConnection, "\xFF\xFF\xFF\xFFgetinfo f")
|
||||||
serverDetails := bytes.Split(serverData[1], []byte("\\"))
|
_, err = bufio.NewReader(serverConnection).Read(serverData)
|
||||||
serverQueue := bytes.FieldsFunc(serverDetails[12], func(c rune) bool { return c == '[' || c == ']' })
|
|
||||||
|
|
||||||
currentPlayerValues, _ := strconv.ParseInt(string(serverDetails[4]), 0, 64)
|
if err == nil {
|
||||||
currentserverQueueValues, _ := strconv.ParseInt(string(serverQueue[0]), 0, 64)
|
serverData := bytes.Split(serverData, []byte("\n"))
|
||||||
ServerDetails.ServerQueue.CurrentPlayers = currentPlayerValues
|
serverDetails := bytes.Split(serverData[1], []byte("\\"))
|
||||||
if currentserverQueueValues >= 1 {
|
serverQueue := bytes.FieldsFunc(serverDetails[12], func(c rune) bool { return c == '[' || c == ']' })
|
||||||
ServerDetails.ServerQueue.CurrentQueue = currentserverQueueValues
|
|
||||||
}
|
currentPlayerValues, _ := strconv.ParseInt(string(serverDetails[4]), 0, 64)
|
||||||
} else {
|
currentserverQueueValues, _ := strconv.ParseInt(string(serverQueue[0]), 0, 64)
|
||||||
return err
|
ServerDetails.ServerQueue.CurrentPlayers = currentPlayerValues
|
||||||
}
|
|
||||||
return
|
if currentserverQueueValues >= 1 {
|
||||||
|
ServerDetails.ServerQueue.CurrentQueue = currentserverQueueValues
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func steam64toSteam(input int64) (steamid string) {
|
func steam64toSteam(input int64) (steamid string) {
|
||||||
legacySteamid := ((input - 76561197960265728) / 2)
|
legacySteamid := ((input - 76561197960265728) / 2)
|
||||||
steamid = fmt.Sprintf("STEAM_0:%d:%d", (input % 2), legacySteamid)
|
steamid = fmt.Sprintf("STEAM_0:%d:%d", (input % 2), legacySteamid)
|
||||||
return
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func parsePlayers() (err error) {
|
func parsePlayers() (err error) {
|
||||||
var steamIDs []string
|
var steamIDs []string
|
||||||
for i, v := range ServerDetails.Players {
|
for i, v := range ServerDetails.Players {
|
||||||
steamIDs = nil
|
steamIDs = nil
|
||||||
for ii, vv := range v.Identifiers {
|
for ii, vv := range v.Identifiers {
|
||||||
if ii == 0 {
|
if ii == 0 {
|
||||||
hexID := strings.Replace(vv, "steam:", "0x", -1)
|
hexID := strings.Replace(vv, "steam:", "0x", -1)
|
||||||
steamID, _ := strconv.ParseInt(hexID, 0, 64)
|
steamID, _ := strconv.ParseInt(hexID, 0, 64)
|
||||||
s := strconv.FormatInt(steamID, 10)
|
s := strconv.FormatInt(steamID, 10)
|
||||||
p := getPlayerNoPixelInformation(s)
|
p := getPlayerNoPixelInformation(s)
|
||||||
|
|
||||||
steamIDs = append(steamIDs,
|
steamIDs = append(steamIDs,
|
||||||
p.Name,
|
p.Name,
|
||||||
steam64toSteam(steamID),
|
steam64toSteam(steamID),
|
||||||
fmt.Sprintf("%d", steamID),
|
fmt.Sprintf("%d", steamID),
|
||||||
p.Twitch,
|
p.Twitch,
|
||||||
p.NoPixelID)
|
p.NoPixelID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ServerDetails.Players[i].Identifiers = steamIDs
|
ServerDetails.Players[i].Identifiers = steamIDs
|
||||||
}
|
}
|
||||||
return
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadPlayersJSON() (err error) {
|
func loadPlayersJSON() (err error) {
|
||||||
jsonFile, err := jsonGet.Get("https://github.com/jakejarvis/npqueue/raw/master/directory.json")
|
jsonFile, err := jsonGet.Get("https://github.com/jakejarvis/npqueue/raw/master/directory.json")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = json.NewDecoder(jsonFile.Body).Decode(&NoPixelData)
|
|
||||||
if err != nil {
|
err = json.NewDecoder(jsonFile.Body).Decode(&NoPixelData)
|
||||||
return err
|
if err != nil {
|
||||||
}
|
return err
|
||||||
return
|
}
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func getPlayerNoPixelInformation(id string) (p NoPixelPlayer) {
|
func getPlayerNoPixelInformation(id string) (p NoPixelPlayer) {
|
||||||
for i := range NoPixelData {
|
for i := range NoPixelData {
|
||||||
if NoPixelData[i].SteamID == id {
|
if NoPixelData[i].SteamID == id {
|
||||||
return NoPixelData[i]
|
return NoPixelData[i]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// List handler for now.sh /api/list route
|
// List handler for now.sh /api/list route
|
||||||
func List(w http.ResponseWriter, r *http.Request) {
|
func List(w http.ResponseWriter, r *http.Request) {
|
||||||
err := loadPlayersJSON()
|
err := loadPlayersJSON()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(w, "failed to load JSON file %v", err)
|
fmt.Fprintf(w, "failed to load JSON file %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
getPlayerList()
|
|
||||||
getServerQueueDetails()
|
getPlayerList()
|
||||||
parsePlayers()
|
getServerQueue()
|
||||||
w.Header().Set("Content-Type", "application/json")
|
parsePlayers()
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
json.NewEncoder(w).Encode(ServerDetails)
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
|
||||||
|
json.NewEncoder(w).Encode(ServerDetails)
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
addr := ":" + os.Getenv("PORT")
|
addr := ":" + os.Getenv("PORT")
|
||||||
|
|
||||||
http.HandleFunc("/api/list", List)
|
http.HandleFunc("/api/list", List)
|
||||||
http.Handle("/", http.FileServer(http.Dir("./public")))
|
http.Handle("/", http.FileServer(http.Dir("./public")))
|
||||||
|
|
||||||
log.Printf("Listening on %s...\n", addr)
|
log.Printf("Listening on %s...\n", addr)
|
||||||
if err := http.ListenAndServe(addr, nil); err != nil {
|
if err := http.ListenAndServe(addr, nil); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user