feat(surfshark): update API endpoint and servers data (#1560)

This commit is contained in:
eiqnepm
2023-07-21 19:21:46 +01:00
committed by GitHub
parent 1a5a0148ea
commit c5cc240a6c
3 changed files with 1998 additions and 1342 deletions

View File

@@ -10,7 +10,6 @@ import (
"github.com/qdm12/gluetun/internal/provider/surfshark/servers"
)
// Note: no multi-hop and some OpenVPN servers are missing from their API.
func addServersFromAPI(ctx context.Context, client *http.Client,
hts hostToServers) (err error) {
data, err := fetchAPI(ctx, client)
@@ -52,31 +51,38 @@ type serverData struct {
func fetchAPI(ctx context.Context, client *http.Client) (
servers []serverData, err error) {
const url = "https://my.surfshark.com/vpn/api/v4/server/clusters"
const url = "https://api.surfshark.com/v4/server/clusters"
request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
for _, clustersType := range [...]string{"generic", "double", "static", "obfuscated"} {
request, err := http.NewRequestWithContext(ctx, http.MethodGet, url+"/"+clustersType, nil)
if err != nil {
return nil, err
}
response, err := client.Do(request)
if err != nil {
return nil, err
}
defer response.Body.Close()
response, err := client.Do(request)
if err != nil {
return nil, err
}
defer response.Body.Close()
if response.StatusCode != http.StatusOK {
return nil, fmt.Errorf("%w: %d %s", ErrHTTPStatusCodeNotOK,
response.StatusCode, response.Status)
}
if response.StatusCode != http.StatusOK {
return nil, fmt.Errorf("%w: %d %s", ErrHTTPStatusCodeNotOK,
response.StatusCode, response.Status)
}
decoder := json.NewDecoder(response.Body)
if err := decoder.Decode(&servers); err != nil {
return nil, fmt.Errorf("decoding response body: %w", err)
}
decoder := json.NewDecoder(response.Body)
var newServers []serverData
err = decoder.Decode(&newServers)
if err != nil {
return nil, fmt.Errorf("decoding response body: %w", err)
}
if err := response.Body.Close(); err != nil {
return nil, err
err = response.Body.Close()
if err != nil {
return nil, err
}
servers = append(servers, newServers...)
}
return servers, nil