refactor(httpx): improve and modernize (1/n) (#647)
This PR starts to implement the refactoring described at https://github.com/ooni/probe/issues/1951. I originally wrote more patches than the ones in this PR, but overall they were not readable. Since I want to squash and merge, here's a reasonable subset of the original patches that will still be readable and understandable in the future.
This commit is contained in:
@@ -19,7 +19,7 @@ func avastIPLookup(
|
||||
userAgent string,
|
||||
) (string, error) {
|
||||
var v avastResponse
|
||||
err := (httpx.Client{
|
||||
err := (&httpx.APIClient{
|
||||
BaseURL: "https://ip-info.ff.avast.com",
|
||||
HTTPClient: httpClient,
|
||||
Logger: logger,
|
||||
|
||||
@@ -16,7 +16,7 @@ func ipConfigIPLookup(
|
||||
logger model.Logger,
|
||||
userAgent string,
|
||||
) (string, error) {
|
||||
data, err := (httpx.Client{
|
||||
data, err := (&httpx.APIClient{
|
||||
BaseURL: "https://ipconfig.io",
|
||||
HTTPClient: httpClient,
|
||||
Logger: logger,
|
||||
|
||||
@@ -20,7 +20,7 @@ func ipInfoIPLookup(
|
||||
userAgent string,
|
||||
) (string, error) {
|
||||
var v ipInfoResponse
|
||||
err := (httpx.Client{
|
||||
err := (&httpx.APIClient{
|
||||
Accept: "application/json",
|
||||
BaseURL: "https://ipinfo.io",
|
||||
HTTPClient: httpClient,
|
||||
|
||||
@@ -20,7 +20,7 @@ func ubuntuIPLookup(
|
||||
logger model.Logger,
|
||||
userAgent string,
|
||||
) (string, error) {
|
||||
data, err := (httpx.Client{
|
||||
data, err := (&httpx.APIClient{
|
||||
BaseURL: "https://geoip.ubuntu.com/",
|
||||
HTTPClient: httpClient,
|
||||
Logger: logger,
|
||||
|
||||
Reference in New Issue
Block a user