From c9d498d1f47198fe4912636750552b7094aeba9e Mon Sep 17 00:00:00 2001 From: ngn Date: Fri, 2 May 2025 17:04:28 +0300 Subject: [PATCH] fix flareresolver url and use /v1 api path Signed-off-by: ngn --- src/utils/request.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/utils/request.go b/src/utils/request.go index 324d100..3cea12f 100644 --- a/src/utils/request.go +++ b/src/utils/request.go @@ -2,6 +2,7 @@ package utils import ( "net/http" + "net/url" "os" "github.com/go-resty/resty/v2" @@ -24,7 +25,7 @@ type response struct { Solution solution `json:"solution"` } -func GET(url string) ([]byte, int, http.Header, error) { +func GET(target string) ([]byte, int, http.Header, error) { var ( client *resty.Client = resty.New() res *resty.Response = nil @@ -33,22 +34,24 @@ func GET(url string) ([]byte, int, http.Header, error) { ) if frurl = os.Getenv("FLARERESOLVER"); frurl == "" { - if res, err := client.R().Get(url); err != nil { + if res, err := client.R().Get(target); err != nil { return nil, 0, nil, err } else { return res.Body(), res.StatusCode(), res.Header(), nil } } + frurl, _ = url.JoinPath(frurl, "/v1") + client.R().SetHeader("Content-Type", "application/json") client.R().SetBody(request{ Cmd: "request.get", - Url: frurl, + Url: target, MaxTimeout: 60000, }) client.R().SetResult(&response{}) - if res, err = client.R().Post(url); err != nil { + if res, err = client.R().Post(frurl); err != nil { return nil, 0, nil, err }