Feature: filter by hostname for PureVPN servers

- Record support for TCP and UDP for each hostname
- Fix: each hostname supports only TCP or UDP, not both
- Update PureVPN server information

internal/updater/providers/purevpn/hosttoserver.go

@@ -8,9 +8,18 @@ import (
 
 type hostToServer map[string]models.PurevpnServer
 
-func (hts hostToServer) add(host string) {
-	// TODO set TCP and UDP compatibility, set hostname
-	hts[host] = models.PurevpnServer{}
+func (hts hostToServer) add(host string, tcp, udp bool) {
+	server, ok := hts[host]
+	if !ok {
+		server.Hostname = host
+	}
+	if tcp {
+		server.TCP = true
+	}
+	if udp {
+		server.UDP = true
+	}
+	hts[host] = server
 }
 
 func (hts hostToServer) toHostsSlice() (hosts []string) {

internal/updater/providers/purevpn/locationtoserver.go

@@ -1,33 +0,0 @@
-package purevpn
-
-import (
-	"net"
-
-	"github.com/qdm12/gluetun/internal/models"
-)
-
-type locationToServer map[string]models.PurevpnServer
-
-func locationKey(country, region, city string) string {
-	return country + region + city
-}
-
-func (lts locationToServer) add(country, region, city string, ips []net.IP) {
-	key := locationKey(country, region, city)
-	server, ok := lts[key]
-	if !ok {
-		server.Country = country
-		server.Region = region
-		server.City = city
-	}
-	server.IPs = append(server.IPs, ips...)
-	lts[key] = server
-}
-
-func (lts locationToServer) toServersSlice() (servers []models.PurevpnServer) {
-	servers = make([]models.PurevpnServer, 0, len(lts))
-	for _, server := range lts {
-		servers = append(servers, server)
-	}
-	return servers
-}

internal/updater/providers/purevpn/servers.go

@@ -38,6 +38,14 @@ func GetServers(ctx context.Context, client *http.Client,
 			continue
 		}
 
+		tcp, udp, err := openvpn.ExtractProto(content)
+		if err != nil {
+			// treat error as warning and go to next file
+			warning := err.Error() + " in " + fileName
+			warnings = append(warnings, warning)
+			continue
+		}
+
 		host, warning, err := openvpn.ExtractHost(content)
 		if warning != "" {
 			warnings = append(warnings, warning)
@@ -50,7 +58,7 @@ func GetServers(ctx context.Context, client *http.Client,
 			continue
 		}
 
-		hts.add(host)
+		hts.add(host, tcp, udp)
 	}
 
 	if len(hts) < minServers {
@@ -83,22 +91,12 @@ func GetServers(ctx context.Context, client *http.Client,
 	if err != nil {
 		return nil, warnings, err
 	}
-
-	// Dedup by location
-	lts := make(locationToServer)
-	for i, server := range servers {
-		// TODO split servers by host
-		ipInfo := ipsInfo[i]
-		lts.add(ipInfo.Country, ipInfo.Region, ipInfo.City, server.IPs)
+	for i := range servers {
+		servers[i].Country = ipsInfo[i].Country
+		servers[i].Region = ipsInfo[i].Region
+		servers[i].City = ipsInfo[i].City
 	}
 
-	if len(servers) < minServers {
-		return nil, warnings, fmt.Errorf("%w: %d and expected at least %d",
-			ErrNotEnoughServers, len(servers), minServers)
-	}
-
-	servers = lts.toServersSlice()
-
 	sortServers(servers)
 
 	return servers, warnings, nil

internal/updater/providers/purevpn/sort.go

@@ -10,6 +10,9 @@ func sortServers(servers []models.PurevpnServer) {
 	sort.Slice(servers, func(i, j int) bool {
 		if servers[i].Country == servers[j].Country {
 			if servers[i].Region == servers[j].Region {
+				if servers[i].City == servers[j].City {
+					return servers[i].Hostname < servers[j].Hostname
+				}
 				return servers[i].City < servers[j].City
 			}
 			return servers[i].Region < servers[j].Region