Skip to content

perf: use a shared resty.Client object for all requests #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kamilon wants to merge 2 commits into from
+36 −27
Closed

perf: use a shared resty.Client object for all requests #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8289049
perf: use a shared resty.Client object for all requests
kamilon Apr 22, 2026
3f7a295
Merge branch 'main' into dev/kamilon/sharedhttpclient
kamilon Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ func init() {
log.Printf("[debug] TibiaData API User-Agent: %s", TibiaDataUserAgent)
}

// Initialize shared HTTP client (must be after TibiaDataUserAgent is set)
initTibiaDataClient()

// Initiate the validator
err := validation.Initiate(TibiaDataUserAgent)
if err != nil {
Expand Down
60 changes: 33 additions & 27 deletions src/webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,41 @@ var (
// TibiaData app resty vars
TibiaDataUserAgent, TibiaDataProxyDomain string

// tibiaDataClient is a shared resty client reused across all requests
tibiaDataClient *resty.Client

// ErrorNotFound will be returned if the requests ends up in a 404
ErrorNotFound = errors.New("page not found")
)

// initTibiaDataClient creates the shared resty client with static configuration.
// Must be called after TibiaDataUserAgent is set.
func initTibiaDataClient() {
tibiaDataClient = resty.New()

// Set Debug if enabled by TibiaDataDebug var
if TibiaDataDebug {
tibiaDataClient.SetDebug(true)
tibiaDataClient.EnableTrace()
}

// Set client timeout and retry
tibiaDataClient.SetTimeout(5 * time.Second)
tibiaDataClient.SetRetryCount(2)

// Set headers for all requests
tibiaDataClient.SetHeaders(map[string]string{
"Content-Type": "application/json",
"User-Agent": TibiaDataUserAgent,
})

// Enabling Content length value for all request
tibiaDataClient.SetContentLength(true)

// Disable redirection of client (so we skip parsing maintenance page)
tibiaDataClient.SetRedirectPolicy(resty.NoRedirectPolicy())
}

// DebugOutInformation wraps OutInformation with some debug info
type DebugOutInformation struct {
Information Information `json:"information"`
Expand Down Expand Up @@ -1197,31 +1228,6 @@ func TibiaDataUserAgentGenerator(version int) string {

// TibiaDataHTMLDataCollector func
func TibiaDataHTMLDataCollector(TibiaDataRequest TibiaDataRequestStruct) (string, error) {
// Setting up resty client
client := resty.New()

// Set Debug if enabled by TibiaDataDebug var
if TibiaDataDebug {
client.SetDebug(true)
client.EnableTrace()
}

// Set client timeout and retry
client.SetTimeout(5 * time.Second)
client.SetRetryCount(2)

// Set headers for all requests
client.SetHeaders(map[string]string{
"Content-Type": "application/json",
"User-Agent": TibiaDataUserAgent,
})

// Enabling Content length value for all request
client.SetContentLength(true)

// Disable redirection of client (so we skip parsing maintenance page)
client.SetRedirectPolicy(resty.NoRedirectPolicy())

// Replace domain with proxy if env TIBIADATA_PROXY set
if TibiaDataProxyDomain != "" {
TibiaDataRequest.URL = strings.ReplaceAll(TibiaDataRequest.URL, "https://www.tibia.com/", TibiaDataProxyDomain)
Expand All @@ -1236,11 +1242,11 @@ func TibiaDataHTMLDataCollector(TibiaDataRequest TibiaDataRequestStruct) (string

switch TibiaDataRequest.Method {
case resty.MethodPost:
res, err = client.R().
res, err = tibiaDataClient.R().
SetFormData(TibiaDataRequest.FormData).
Post(TibiaDataRequest.URL)
default:
res, err = client.R().Get(TibiaDataRequest.URL)
res, err = tibiaDataClient.R().Get(TibiaDataRequest.URL)
}

if TibiaDataDebug {
Expand Down
Loading