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)

gluetun-servers/pkg/updaters/providers/vyprvpn/filename.go

@@ -0,0 +1,19 @@
+package vyprvpn
+
+import (
+	"fmt"
+	"strings"
+)
+
+func parseFilename(fileName string) (
+	region string, err error,
+) {
+	const suffix = ".ovpn"
+	if !strings.HasSuffix(fileName, suffix) {
+		return "", fmt.Errorf("filename does not have the openvpn file extension: %s", fileName)
+	}
+
+	region = strings.TrimSuffix(fileName, suffix)
+	region = strings.ReplaceAll(region, " - ", " ")
+	return region, nil
+}

gluetun-servers/pkg/updaters/providers/vyprvpn/hosttoserver.go

@@ -0,0 +1,55 @@
+package vyprvpn
+
+import (
+	"net/netip"
+
+	"github.com/qdm12/gluetun-servers/pkg/constants"
+	"github.com/qdm12/gluetun-servers/pkg/models"
+)
+
+type hostToServer map[string]models.Server
+
+func (hts hostToServer) add(host, region string, tcp, udp bool) {
+	server, ok := hts[host]
+	if !ok {
+		server.VPN = constants.OpenVPN
+		server.Hostname = host
+		server.Region = region
+	}
+	if tcp {
+		server.TCP = true
+	}
+	if udp {
+		server.UDP = true
+	}
+	hts[host] = server
+}
+
+func (hts hostToServer) toHostsSlice() (hosts []string) {
+	hosts = make([]string, 0, len(hts))
+	for host := range hts {
+		hosts = append(hosts, host)
+	}
+	return hosts
+}
+
+func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]netip.Addr) {
+	for host, IPs := range hostToIPs {
+		server := hts[host]
+		server.IPs = IPs
+		hts[host] = server
+	}
+	for host, server := range hts {
+		if len(server.IPs) == 0 {
+			delete(hts, host)
+		}
+	}
+}
+
+func (hts hostToServer) toServersSlice() (servers []models.Server) {
+	servers = make([]models.Server, 0, len(hts))
+	for _, server := range hts {
+		servers = append(servers, server)
+	}
+	return servers
+}

gluetun-servers/pkg/updaters/providers/vyprvpn/resolve.go

@@ -0,0 +1,28 @@
+package vyprvpn
+
+import (
+	"time"
+
+	"github.com/qdm12/gluetun-servers/pkg/updaters/resolver"
+)
+
+func parallelResolverSettings(hosts []string) (settings resolver.ParallelSettings) {
+	const (
+		maxFailRatio    = 0.1
+		maxDuration     = 5 * time.Second
+		betweenDuration = time.Second
+		maxNoNew        = 2
+		maxFails        = 2
+	)
+	return resolver.ParallelSettings{
+		Hosts:        hosts,
+		MaxFailRatio: maxFailRatio,
+		Repeat: resolver.RepeatSettings{
+			MaxDuration:     maxDuration,
+			BetweenDuration: betweenDuration,
+			MaxNoNew:        maxNoNew,
+			MaxFails:        maxFails,
+			SortIPs:         true,
+		},
+	}
+}

gluetun-servers/pkg/updaters/providers/vyprvpn/servers.go

@@ -0,0 +1,87 @@
+package vyprvpn
+
+import (
+	"context"
+	"fmt"
+	"sort"
+	"strings"
+
+	"github.com/qdm12/gluetun-servers/pkg/models"
+	"github.com/qdm12/gluetun-servers/pkg/updaters/common"
+	"github.com/qdm12/gluetun-servers/pkg/updaters/openvpn"
+)
+
+func (u *Updater) FetchServers(ctx context.Context, minServers int) (
+	servers []models.Server, err error,
+) {
+	const url = "https://support.vyprvpn.com/hc/article_attachments/44585865394189"
+	contents, err := u.unzipper.FetchAndExtract(ctx, url)
+	if err != nil {
+		return nil, err
+	} else if len(contents) < minServers {
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
+			common.ErrNotEnoughServers, len(contents), minServers)
+	}
+
+	hts := make(hostToServer)
+
+	for fileName, content := range contents {
+		if !strings.HasSuffix(fileName, ".ovpn") {
+			continue // not an OpenVPN file
+		}
+
+		host, warning, err := openvpn.ExtractHost(content)
+		if warning != "" {
+			u.warner.Warn(warning)
+		}
+		if err != nil {
+			// treat error as warning and go to next file
+			u.warner.Warn(err.Error() + " in " + fileName)
+			continue
+		}
+
+		tcp, udp, err := openvpn.ExtractProto(content)
+		if err != nil {
+			// treat error as warning and go to next file
+			u.warner.Warn(err.Error() + " in " + fileName)
+			continue
+		}
+
+		region, err := parseFilename(fileName)
+		if err != nil {
+			// treat error as warning and go to next file
+			u.warner.Warn(err.Error())
+			continue
+		}
+
+		hts.add(host, region, tcp, udp)
+	}
+
+	if len(hts) < minServers {
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
+			common.ErrNotEnoughServers, len(hts), minServers)
+	}
+
+	hosts := hts.toHostsSlice()
+	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)
+	}
+
+	hts.adaptWithIPs(hostToIPs)
+
+	servers = hts.toServersSlice()
+
+	sort.Sort(models.SortableServers(servers))
+
+	return servers, nil
+}

gluetun-servers/pkg/updaters/providers/vyprvpn/updater.go

@@ -0,0 +1,29 @@
+package vyprvpn
+
+import (
+	"github.com/qdm12/gluetun-servers/pkg/updaters/common"
+)
+
+type Updater struct {
+	unzipper         common.Unzipper
+	parallelResolver common.ParallelResolver
+	warner           common.Warner
+}
+
+func New(unzipper common.Unzipper, warner common.Warner,
+	parallelResolver common.ParallelResolver,
+) *Updater {
+	return &Updater{
+		unzipper:         unzipper,
+		parallelResolver: parallelResolver,
+		warner:           warner,
+	}
+}
+
+func (u *Updater) Version() uint16 {
+	return 3 //nolint:mnd
+}
+
+func (u *Updater) Name() string {
+	return "vyprvpn"
+}