Feature: filter Surfshark servers by hostname

internal/updater/providers/surfshark/hosttoserver.go

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

internal/updater/providers/surfshark/servers.go

@@ -36,6 +36,14 @@ func GetServers(ctx context.Context, unzipper unzip.Unzipper,
 			continue // not an OpenVPN file
 		}
 
+		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)
@@ -55,7 +63,7 @@ func GetServers(ctx context.Context, unzipper unzip.Unzipper,
 			continue
 		}
 
-		hts.add(host, region)
+		hts.add(host, region, tcp, udp)
 	}
 
 	if len(hts) < minServers {
@@ -119,9 +127,14 @@ func getRemainingServers(ctx context.Context,
 		if err != nil {
 			return nil, warnings, err
 		}
+
+		// we assume the server supports TCP and UDP
 		server := models.SurfsharkServer{
-			Region: region,
-			IPs:    IPs,
+			Region:   region,
+			Hostname: host,
+			TCP:      true,
+			UDP:      true,
+			IPs:      IPs,
 		}
 		servers = append(servers, server)
 	}

internal/updater/providers/surfshark/sort.go

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