csmith1865/ping-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add query parameter to disable query lookup

Browse Source
This commit is contained in:
Jacob Gunther
2023-05-03 09:42:49 -05:00
parent 4da4027c57
commit 4b61ace3c8
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/routes.go
View File

@@ -31,11 +31,13 @@ func JavaStatusHandler(ctx *fiber.Ctx) error {
return ctx.Status(http.StatusBadRequest).SendString("Invalid address value") return ctx.Status(http.StatusBadRequest).SendString("Invalid address value")
} }
enableQuery := ctx.QueryBool("query", true)
if err = r.Increment(fmt.Sprintf("java-hits:%s-%d", host, port)); err != nil { if err = r.Increment(fmt.Sprintf("java-hits:%s-%d", host, port)); err != nil {
return err return err
} }
response, expiresAt, err := GetJavaStatus(host, port) response, expiresAt, err := GetJavaStatus(host, port, enableQuery)
if err != nil { if err != nil {
return err return err
@@ -62,7 +64,7 @@ func JavaWidgetHandler(ctx *fiber.Ctx) error {
return err return err
} }
response, _, err := GetJavaStatus(host, port) response, _, err := GetJavaStatus(host, port, false)
if err != nil { if err != nil {
return err return err

28
src/status.go
View File

@@ -113,8 +113,8 @@ type Plugin struct {
} }
// GetJavaStatus returns the status response of a Java Edition server, either using cache or fetching a fresh status. // GetJavaStatus returns the status response of a Java Edition server, either using cache or fetching a fresh status.
func GetJavaStatus(host string, port uint16) (*JavaStatusResponse, time.Duration, error) { func GetJavaStatus(host string, port uint16, enableQuery bool) (*JavaStatusResponse, time.Duration, error) {
cacheKey := fmt.Sprintf("java:%s-%d", host, port) cacheKey := fmt.Sprintf("java:%v-%s-%d", enableQuery, host, port)
cache, ttl, err := r.Get(cacheKey) cache, ttl, err := r.Get(cacheKey)
@@ -130,7 +130,7 @@ func GetJavaStatus(host string, port uint16) (*JavaStatusResponse, time.Duration
return &response, ttl, err return &response, ttl, err
} }
response := FetchJavaStatus(host, port) response := FetchJavaStatus(host, port, enableQuery)
data, err := json.Marshal(response) data, err := json.Marshal(response)
@@ -218,11 +218,9 @@ func GetServerIcon(host string, port uint16) ([]byte, time.Duration, error) {
} }
// FetchJavaStatus fetches fresh information about a Java Edition Minecraft server. // FetchJavaStatus fetches fresh information about a Java Edition Minecraft server.
func FetchJavaStatus(host string, port uint16) JavaStatusResponse { func FetchJavaStatus(host string, port uint16, enableQuery bool) JavaStatusResponse {
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(2)
var status interface{} = nil var status interface{} = nil
var query *response.FullQuery = nil var query *response.FullQuery = nil
@@ -236,13 +234,19 @@ func FetchJavaStatus(host string, port uint16) JavaStatusResponse {
} }
}() }()
go func() { wg.Add(1)
defer wg.Done()
query, _ = mcutil.FullQuery(host, port, options.Query{ if enableQuery {
Timeout: time.Second, go func() {
}) defer wg.Done()
}()
query, _ = mcutil.FullQuery(host, port, options.Query{
Timeout: time.Second,
})
}()
wg.Add(1)
}
wg.Wait() wg.Wait()