VexoraDevelopment/gamestatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename mcstatus to gamestatus

Browse Source
This commit is contained in:
Andrewkydev
2026-04-05 13:43:11 +03:00
parent 39a3ceadbb
commit cdf375ba80
15 changed files with 319 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
cmd/mcstatus/main.go → cmd/gamestatus/main.go
View File

@@ -9,8 +9,8 @@ import (
"strings"
"time"
"github.com/VexoraDevelopment/mcstatus"
"github.com/VexoraDevelopment/mcstatus/text"
"github.com/VexoraDevelopment/gamestatus"
"github.com/VexoraDevelopment/gamestatus/text"
)
func main() {
@@ -28,7 +28,7 @@ func main() {
fatal(err)
}
client := mcstatus.NewAll(cfg.timeout)
client := gamestatus.NewAll(cfg.timeout)
info, err := connect(client, cfg.edition, host, port, cfg.useQuery)
if err != nil {
@@ -48,12 +48,12 @@ func main() {
}
type cliConfig struct {
edition string
timeout time.Duration
asJSON bool
edition string
timeout time.Duration
asJSON bool
useQuery bool
pretty bool
motdRaw bool
pretty bool
motdRaw bool
}
func parseCLI(args []string) (cliConfig, string, error) {
@@ -62,9 +62,9 @@ func parseCLI(args []string) (cliConfig, string, error) {
timeout: 3 * time.Second,
}
fs := flag.NewFlagSet("mcstatus", flag.ContinueOnError)
fs := flag.NewFlagSet("gamestatus", flag.ContinueOnError)
fs.SetOutput(os.Stderr)
edition := fs.String("edition", "auto", "server edition: auto, java, bedrock")
edition := fs.String("edition", "auto", "server edition: auto, java, bedrock, source, rust, cs2, valve")
timeout := fs.Duration("timeout", 3*time.Second, "request timeout")
asJSON := fs.Bool("json", false, "print JSON output")
useQuery := fs.Bool("query", false, "use full query when supported")
@@ -73,7 +73,7 @@ func parseCLI(args []string) (cliConfig, string, error) {
if len(args) > 0 {
switch strings.ToLower(strings.TrimSpace(args[0])) {
case "auto", "java", "bedrock":
case "auto", "java", "bedrock", "source", "rust", "cs2", "valve":
cfg.edition = strings.ToLower(strings.TrimSpace(args[0]))
args = args[1:]
}
@@ -87,7 +87,7 @@ func parseCLI(args []string) (cliConfig, string, error) {
if cfg.edition == "auto" && len(args) > 0 {
// Preserve subcommand semantics while still allowing -edition overrides.
switch strings.ToLower(strings.TrimSpace(os.Args[1])) {
case "auto", "java", "bedrock":
case "auto", "java", "bedrock", "source", "rust", "cs2", "valve":
cfg.edition = strings.ToLower(strings.TrimSpace(os.Args[1]))
}
}
@@ -104,14 +104,18 @@ func parseCLI(args []string) (cliConfig, string, error) {
}
func printUsage() {
fmt.Fprintf(os.Stderr, "Usage: %s [auto|java|bedrock] [flags] <host[:port]>\n\n", os.Args[0])
fmt.Fprintf(os.Stderr, "Usage: %s [auto|java|bedrock|source|rust|cs2|valve] [flags] <host[:port]>\n\n", os.Args[0])
fmt.Fprintln(os.Stderr, "Examples:")
fmt.Fprintf(os.Stderr, " %s mc.hypixel.net\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s java mc.hypixel.net\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s bedrock -query play.example.com:19132\n\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s source 127.0.0.1:27015\n\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s rust 127.0.0.1:28015\n\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s cs2 127.0.0.1:27015\n\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s valve 127.0.0.1:27015\n\n", os.Args[0])
fmt.Fprintln(os.Stderr, "Flags:")
fmt.Fprintln(os.Stderr, " -edition string")
fmt.Fprintln(os.Stderr, " server edition: auto, java, bedrock")
fmt.Fprintln(os.Stderr, " server edition: auto, java, bedrock, source, rust, cs2, valve")
fmt.Fprintln(os.Stderr, " -timeout duration")
fmt.Fprintln(os.Stderr, " request timeout (default 3s)")
fmt.Fprintln(os.Stderr, " -json")
@@ -124,36 +128,75 @@ func printUsage() {
fmt.Fprintln(os.Stderr, " print raw MOTD without cleanup")
}
func connect(client *mcstatus.Client, edition, host string, port int, useQuery bool) (*mcstatus.ServerInfo, error) {
func connect(client *gamestatus.Client, edition, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
switch edition {
case "auto":
if info, err := connectJava(client, host, port, useQuery); err == nil {
return info, nil
}
return connectBedrock(client, host, port, useQuery)
if info, err := connectBedrock(client, host, port, useQuery); err == nil {
return info, nil
}
return connectSource(client, host, port, useQuery)
case "java":
return connectJava(client, host, port, useQuery)
case "bedrock":
return connectBedrock(client, host, port, useQuery)
case "source":
return connectSource(client, host, port, useQuery)
case "rust":
return connectRust(client, host, port, useQuery)
case "cs2":
return connectCS2(client, host, port, useQuery)
case "valve":
return connectValve(client, host, port, useQuery)
default:
return nil, fmt.Errorf("unsupported edition %q", edition)
}
}
func connectJava(client *mcstatus.Client, host string, port int, useQuery bool) (*mcstatus.ServerInfo, error) {
func connectJava(client *gamestatus.Client, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
if useQuery {
return client.Java.QueryFull(host, port)
}
return client.Java.Connect(host, port)
}
func connectBedrock(client *mcstatus.Client, host string, port int, useQuery bool) (*mcstatus.ServerInfo, error) {
func connectBedrock(client *gamestatus.Client, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
if useQuery {
return client.Bedrock.QueryFull(host, port)
}
return client.Bedrock.Connect(host, port)
}
func connectSource(client *gamestatus.Client, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
if useQuery {
return client.Source.QueryFull(host, port)
}
return client.Source.Connect(host, port)
}
func connectRust(client *gamestatus.Client, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
if useQuery {
return client.Source.QueryFullRust(host, port)
}
return client.Source.ConnectRust(host, port)
}
func connectCS2(client *gamestatus.Client, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
if useQuery {
return client.Source.QueryFullCS2(host, port)
}
return client.Source.ConnectCS2(host, port)
}
func connectValve(client *gamestatus.Client, host string, port int, useQuery bool) (*gamestatus.ServerInfo, error) {
if useQuery {
return client.Source.QueryFullValve(host, port)
}
return client.Source.ConnectValve(host, port)
}
func parseTarget(target string) (string, int, error) {
host := strings.TrimSpace(target)
if host == "" {
@@ -191,7 +234,7 @@ func parseTarget(target string) (string, int, error) {
return host, 0, nil
}
func printText(info *mcstatus.ServerInfo, pretty bool, motdRaw bool) {
func printText(info *gamestatus.ServerInfo, pretty bool, motdRaw bool) {
motd := info.MOTD
if !motdRaw {
motd = text.CleanMOTD(motd)
@@ -234,7 +277,7 @@ func printText(info *mcstatus.ServerInfo, pretty bool, motdRaw bool) {
fmt.Printf("Query: %t\n", info.Query)
}
func printPretty(info *mcstatus.ServerInfo, motd string) {
func printPretty(info *gamestatus.ServerInfo, motd string) {
fmt.Printf("%s %s:%d\n", strings.ToUpper(string(info.Edition)), info.Address, info.Port)
if motd != "" {
fmt.Printf("%s\n", motd)
@@ -253,6 +296,6 @@ func printPretty(info *mcstatus.ServerInfo, motd string) {
}
func fatal(err error) {
fmt.Fprintln(os.Stderr, "mcstatus:", err)
fmt.Fprintln(os.Stderr, "gamestatus:", err)
os.Exit(1)
}