BitMaster/windscribe-proxy
1
0
Fork 0
mirror of https://github.com/Snawoot/windscribe-proxy.git synced 2026-04-11 18:38:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wndclient: add BestLocation method

Browse Source
This commit is contained in:
Vladislav Yarmak
2021-06-25 03:39:42 +03:00
parent 857d435bf9
commit c96b7ca763
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wndclient/messages.go
View File

@@ -82,3 +82,15 @@ type ServerListGroupHost struct {
Hostname string `json:"hostname"`
Weight float64 `json:"weight"`
}
type BestLocationResponse struct {
Data *struct {
CountryCode string `json:"country_code"`
ShortName string `json:"short_name"`
LocationName string `json:"location_name"`
CityName string `json:"city_name"`
DCID int `json:"dc_id"`
ServerID int `json:"server_id"`
Hostname string `json:"hostname"`
} `json:"data"`
}

31
wndclient/wndclient.go
View File

@@ -33,6 +33,7 @@ type WndEndpoints struct {
Users string `json:"Users"`
ServerList string `json:"serverlist"`
ServerCredentials string `json:"ServerCredentials"`
BestLocation string `json:"BestLocation"`
}
var DefaultWndEndpoints = WndEndpoints{
@@ -40,6 +41,7 @@ var DefaultWndEndpoints = WndEndpoints{
Users: "https://api.windscribe.com/Users",
ServerList: "https://assets.windscribe.com/serverlist",
ServerCredentials: "https://api.windscribe.com/ServerCredentials",
BestLocation: "https://api.windscribe.com/BestLocation",
}
type WndSettings struct {
@@ -193,6 +195,35 @@ func (c *WndClient) ServerCredentials(ctx context.Context) error {
return nil
}
func (c *WndClient) BestLocation(ctx context.Context) (*BestLocationResponse, error) {
c.Mux.Lock()
defer c.Mux.Unlock()
clientAuthHash, authTime := MakeAuthHash(c.State.Settings.ClientAuthSecret)
requestUrl, err := url.Parse(c.State.Settings.Endpoints.ServerCredentials)
if err != nil {
return nil, err
}
queryValues := requestUrl.Query()
queryValues.Set("client_auth_hash", clientAuthHash)
queryValues.Set("session_auth_hash", c.State.SessionAuthHash)
queryValues.Set("time", strconv.FormatInt(authTime, 10))
requestUrl.RawQuery = queryValues.Encode()
var output BestLocationResponse
err = c.getJSON(ctx, requestUrl.String(), &output)
if err != nil {
return nil, err
}
if output.Data == nil {
return nil, ErrNoDataInResponse
}
return &output, nil
}
func (c *WndClient) ServerList(ctx context.Context) (ServerList, error) {
c.Mux.Lock()
defer c.Mux.Unlock()