admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Faster servers information updater (#248)

Browse Source 
* Asynchronous repeatResolve
* Parallel cyberghost and PIA (v3) processing, with a 10 goroutines limit
* Add missing vyprvpn cli flag to updater
* Increase DNS repetitions to 5 in order to obtain more IP addresses
* Update old PIA IP addresses
* Add Surfshark servers by API (unused for now)
This commit is contained in:
Quentin McGaw
2020-09-18 15:52:28 -04:00
committed by GitHub
parent c5b5ae9ca7
commit 564d9cbf90
12 changed files with 286 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
internal/updater/cyberghost.go
View File

@@ -27,29 +27,52 @@ func findCyberghostServers(ctx context.Context, lookupIP lookupIPFunc) (servers
cyberghostCountryCodes := getCyberghostSubdomainToRegion()
possibleCountryCodes := mergeCountryCodes(cyberghostCountryCodes, allCountryCodes)
results := make(chan models.CyberghostServer)
const maxGoroutines = 10
guard := make(chan struct{}, maxGoroutines)
for groupID, groupName := range groups {
for countryCode, region := range possibleCountryCodes {
if err := ctx.Err(); err != nil {
return nil, err
}
host := fmt.Sprintf("%s-%s.cg-dialup.net", groupID, countryCode)
IPs, err := resolveRepeat(ctx, lookupIP, host, 2)
if err != nil || len(IPs) == 0 {
continue
}
servers = append(servers, models.CyberghostServer{
Region: region,
Group: groupName,
IPs: IPs,
})
const domain = "cg-dialup.net"
host := fmt.Sprintf("%s-%s.%s", groupID, countryCode, domain)
guard <- struct{}{}
go tryCyberghostHostname(ctx, lookupIP, host, groupName, region, results)
<-guard
}
}
for i := 0; i < len(groups)*len(possibleCountryCodes); i++ {
server := <-results
if server.IPs == nil {
continue
}
servers = append(servers, server)
}
if err := ctx.Err(); err != nil {
return servers, err
}
sort.Slice(servers, func(i, j int) bool {
return servers[i].Region < servers[j].Region
})
return servers, nil
}
func tryCyberghostHostname(ctx context.Context, lookupIP lookupIPFunc,
host, groupName, region string,
results chan<- models.CyberghostServer) {
IPs, err := resolveRepeat(ctx, lookupIP, host, 2)
if err != nil || len(IPs) == 0 {
results <- models.CyberghostServer{}
return
}
results <- models.CyberghostServer{
Region: region,
Group: groupName,
IPs: IPs,
}
}
//nolint:goconst
func stringifyCyberghostServers(servers []models.CyberghostServer) (s string) {
s = "func CyberghostServers() []models.CyberghostServer {\n"