cleanup (country default now comes from flag)

README.md

@@ -11,12 +11,22 @@ Download binary from releases for your platform and unpack.
 ### Default usage
 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.
+### Command line parameters
+
+```angular2html
+Usage of dist/mullvad-best-server_darwin_amd64/mullvad-best-server:
+-c string
+  Server country code, e.g. ch for Switzerland (default "ch")
+-o string
+  Output format. 'json' outputs server json
+-t string
+  Server type, e.g. wireguard (default "wireguard")
+```
+
+If you want the full server information, execute `mullvad-best-server -o json`. It returns the full json output  of the server information.
+The `-c` flag allows to give a country code. Else `ch` will be used.
 
-### 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
+The program uses `https://api.mullvad.net/www/relays/<SERVER_TYPE/` to get the current server list, pings the ones with the right country
 and outputs the server with the lowest ping.

main.go

@@ -18,18 +18,20 @@ 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 outputFlag = flag.String("o", "", "Output format. 'json' outputs server json")
 	var countryFlag = flag.String("c", "ch", "Server country code, e.g. ch for Switzerland")
+	var typeFlag = flag.String("t", "wireguard", "Server type, e.g. wireguard")
 	flag.Parse()
 
-	servers := getServers()
-	bestIndex := selectBestServerIndex(servers, countryFlag)
-	log.Debug().Interface("server", servers[bestIndex]).Msg("Best latency server found.")
-	hostname := strings.Split(servers[bestIndex].Hostname, "-")[0]
+	servers := getServers(*typeFlag)
+	bestIndex := selectBestServerIndex(servers, *countryFlag)
+	best := servers[bestIndex]
+	log.Debug().Interface("server", best).Msg("Best latency server found.")
+	hostname := strings.TrimSuffix(best.Hostname, "-wireguard")
 	if *outputFlag != "json" {
 		fmt.Println(hostname)
 	} else {
-		serverJson, err := json.Marshal(servers[bestIndex])
+		serverJson, err := json.Marshal(best)
 		if err != nil {
 			log.Fatal().Err(err)
 		}
@@ -37,19 +39,11 @@ func main() {
 	}
 }
 
-func selectBestServerIndex(servers []server, country *string) int {
+func selectBestServerIndex(servers []server, country string) int {
 	best := servers[0].Hostname
 	bestIndex := -1
-	allowedCountries := map[string]string{}
-	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] != "" {
+		if server.Active && server.CountryCode == country {
 			duration, err := serverLatency(server)
 			if err == nil {
 				pings[server.Hostname] = duration
@@ -63,8 +57,8 @@ func selectBestServerIndex(servers []server, country *string) int {
 	return bestIndex
 }
 
-func getServers() []server {
-	resp, err := http.Get("https://api.mullvad.net/www/relays/wireguard/")
+func getServers(serverType string) []server {
+	resp, err := http.Get("https://api.mullvad.net/www/relays/" + serverType + "/")
 	if err != nil {
 		log.Fatal().Err(err)
 	}