mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-23 10:56:22 +02:00
Quentin McGaw
d9cc7dcffb
- new directory structure containing manifest.json and one json file per provider, by default. - the manifest.json file can specify a filepath for each vpn provider - each vpn provider json data file can contain the `"preferred": true` field to enforce it is used even if outdated, unless there is a version mismatch - `STORAGE_SERVERS_DIRECTORY_PATH` replaces `STORAGE_FILEPATH` (which is now a migration source only). It sets the directory where server manifest and per-provider JSON files are stored (default: `/gluetun/servers/`). - First-run migration: On startup, gluetun checks for the old /gluetun/servers.json file; if found and no new manifest exists, it automatically migrates all data to /gluetun/servers/ directory structure - Silent fallback: If legacy file isn't found, uses the new directory path normally - Legacy cleanup: After successful migration, attempts to remove the old fat JSON file (logs warning only if removal fails, e.g., read-only bind mounts)
75 lines
1.7 KiB
Go
75 lines
1.7 KiB
Go
package hidemyass
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sort"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/constants"
|
|
"github.com/qdm12/gluetun-servers/pkg/models"
|
|
"github.com/qdm12/gluetun-servers/pkg/updaters/common"
|
|
)
|
|
|
|
func (u *Updater) FetchServers(ctx context.Context, minServers int) (
|
|
servers []models.Server, err error,
|
|
) {
|
|
tcpHostToURL, udpHostToURL, err := getAllHostToURL(ctx, u.client)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
hosts := getUniqueHosts(tcpHostToURL, udpHostToURL)
|
|
|
|
if len(hosts) < minServers {
|
|
return nil, fmt.Errorf("%w: %d and expected at least %d",
|
|
common.ErrNotEnoughServers, len(hosts), minServers)
|
|
}
|
|
|
|
resolveSettings := parallelResolverSettings(hosts)
|
|
hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
|
|
for _, warning := range warnings {
|
|
u.warner.Warn(warning)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(hostToIPs) < minServers {
|
|
return nil, fmt.Errorf("%w: %d and expected at least %d",
|
|
common.ErrNotEnoughServers, len(servers), minServers)
|
|
}
|
|
|
|
servers = make([]models.Server, 0, len(hostToIPs))
|
|
for host, IPs := range hostToIPs {
|
|
tcpURL, tcp := tcpHostToURL[host]
|
|
udpURL, udp := udpHostToURL[host]
|
|
|
|
// These two are only used to extract the country, region and city.
|
|
var url, protocol string
|
|
if tcp {
|
|
url = tcpURL
|
|
protocol = "TCP"
|
|
} else if udp {
|
|
url = udpURL
|
|
protocol = "UDP"
|
|
}
|
|
country, region, city := parseOpenvpnURL(url, protocol)
|
|
|
|
server := models.Server{
|
|
VPN: constants.OpenVPN,
|
|
Country: country,
|
|
Region: region,
|
|
City: city,
|
|
Hostname: host,
|
|
IPs: IPs,
|
|
TCP: tcp,
|
|
UDP: udp,
|
|
}
|
|
servers = append(servers, server)
|
|
}
|
|
|
|
sort.Sort(models.SortableServers(servers))
|
|
|
|
return servers, nil
|
|
}
|