add support for selecting a country via CLI flag
This commit is contained in:
parent
130a048394
commit
d2de3225b0
@ -12,7 +12,10 @@ Download binary from releases for your platform and unpack.
|
||||
Execute `mullvad-best-server`. It outputs the code, e.g. `de05`. You can then connect to it with e.g. wireguard using the normal shell scripts.
|
||||
|
||||
### Extended Output
|
||||
If you want the full server information, execute `mullvad-best-server -o json`. It returns the full json output of the server information.
|
||||
If you want the full server information, execute `mullvad-best-server -o json`. It returns the full json output of the server information.
|
||||
|
||||
### Specify Country
|
||||
The -c flag allows to give a country code. Else de/at/ch will be used.
|
||||
|
||||
## Background
|
||||
The program uses `https://api.mullvad.net/www/relays/wireguard/` to get the current server list, pings the ones with the right country
|
||||
|
19
main.go
19
main.go
@ -19,10 +19,11 @@ var pings = make(map[string]time.Duration)
|
||||
func main() {
|
||||
zerolog.SetGlobalLevel(zerolog.InfoLevel)
|
||||
var outputFlag = flag.String("o", "short", "Output format. 'json' outputs server json")
|
||||
var countryFlag = flag.String("c", "ch", "Server country code, e.g. ch for Switzerland")
|
||||
flag.Parse()
|
||||
|
||||
servers := getServers()
|
||||
bestIndex := selectBestServerIndex(servers)
|
||||
bestIndex := selectBestServerIndex(servers, countryFlag)
|
||||
log.Debug().Interface("server", servers[bestIndex]).Msg("Best latency server found.")
|
||||
hostname := strings.Split(servers[bestIndex].Hostname, "-")[0]
|
||||
if *outputFlag != "json" {
|
||||
@ -36,19 +37,23 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
func selectBestServerIndex(servers []server) int {
|
||||
func selectBestServerIndex(servers []server, country *string) int {
|
||||
best := servers[0].Hostname
|
||||
bestIndex := 0
|
||||
bestIndex := -1
|
||||
allowedCountries := map[string]string{}
|
||||
allowedCountries["de"] = "1"
|
||||
allowedCountries["ch"] = "1"
|
||||
allowedCountries["at"] = "1"
|
||||
if *country == "" {
|
||||
allowedCountries["de"] = "1"
|
||||
allowedCountries["ch"] = "1"
|
||||
allowedCountries["at"] = "1"
|
||||
} else {
|
||||
allowedCountries[*country] = "1"
|
||||
}
|
||||
for i, server := range servers {
|
||||
if server.Active && allowedCountries[server.CountryCode] != "" {
|
||||
duration, err := serverLatency(server)
|
||||
if err == nil {
|
||||
pings[server.Hostname] = duration
|
||||
if best == "" || pings[best] > pings[server.Hostname] {
|
||||
if bestIndex == -1 || pings[best] > pings[server.Hostname] {
|
||||
best = server.Hostname
|
||||
bestIndex = i
|
||||
}
|
||||
|
Reference in New Issue
Block a user