refactor(storage): new storage file structure

- 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)
2026-08-02 18:33:23 +02:00 · 2026-04-27 02:47:30 +00:00
parent 13503b0ae0
commit d9cc7dcffb
303 changed files with 304957 additions and 304344 deletions
@@ -0,0 +1,93 @@
+package fastestvpn
+
+import (
+	"net/netip"
+
+	"github.com/qdm12/gluetun-servers/pkg/constants"
+	"github.com/qdm12/gluetun-servers/pkg/models"
+)
+
+type hostToServerData map[string]serverData
+
+type serverData struct {
+	openvpn    bool
+	wireguard  bool
+	country    string
+	city       string
+	openvpnUDP bool
+	openvpnTCP bool
+	ips        []netip.Addr
+}
+
+func (hts hostToServerData) add(host, vpnType, country, city string, tcp, udp bool) {
+	serverData, ok := hts[host]
+	switch vpnType {
+	case constants.OpenVPN:
+		serverData.openvpn = true
+		serverData.openvpnTCP = serverData.openvpnTCP || tcp
+		serverData.openvpnUDP = serverData.openvpnUDP || udp
+	case constants.Wireguard:
+		serverData.wireguard = true
+	default:
+		panic("protocol not supported")
+	}
+
+	if !ok {
+		serverData.country = country
+		serverData.city = city
+	} else if city != "" {
+		// some servers are listed without the city although
+		// they are also listed with the city described, so update
+		// the city field.
+		serverData.city = city
+	}
+
+	hts[host] = serverData
+}
+
+func (hts hostToServerData) toHostsSlice() (hosts []string) {
+	hosts = make([]string, 0, len(hts))
+	for host := range hts {
+		hosts = append(hosts, host)
+	}
+	return hosts
+}
+
+func (hts hostToServerData) adaptWithIPs(hostToIPs map[string][]netip.Addr) {
+	for host, serverData := range hts {
+		ips := hostToIPs[host]
+		if len(ips) == 0 {
+			delete(hts, host)
+			continue
+		}
+		serverData.ips = ips
+		hts[host] = serverData
+	}
+}
+
+func (hts hostToServerData) toServersSlice() (servers []models.Server) {
+	servers = make([]models.Server, 0, 2*len(hts)) //nolint:mnd
+	for hostname, serverData := range hts {
+		baseServer := models.Server{
+			Hostname: hostname,
+			Country:  serverData.country,
+			City:     serverData.city,
+			IPs:      serverData.ips,
+		}
+		if serverData.openvpn {
+			openvpnServer := baseServer
+			openvpnServer.VPN = constants.OpenVPN
+			openvpnServer.TCP = serverData.openvpnTCP
+			openvpnServer.UDP = serverData.openvpnUDP
+			servers = append(servers, openvpnServer)
+		}
+		if serverData.wireguard {
+			wireguardServer := baseServer
+			wireguardServer.VPN = constants.Wireguard
+			const wireguardPublicKey = "658QxufMbjOTmB61Z7f+c7Rjg7oqWLnepTalqBERjF0="
+			wireguardServer.WgPubKey = wireguardPublicKey
+			servers = append(servers, wireguardServer)
+		}
+	}
+	return servers
+}