chore(updater): move updater packages to pkg/updaters/<name>

pkg/updaters/privateinternetaccess/api.go

@@ -0,0 +1,75 @@
+package privateinternetaccess
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/netip"
+)
+
+var ErrHTTPStatusCodeNotOK = errors.New("HTTP status code not OK")
+
+type apiData struct {
+	Regions []regionData `json:"regions"`
+}
+
+type regionData struct {
+	Name        string `json:"name"`
+	DNS         string `json:"dns"`
+	PortForward bool   `json:"port_forward"`
+	Offline     bool   `json:"offline"`
+	Servers     struct {
+		UDP []serverData `json:"ovpnudp"`
+		TCP []serverData `json:"ovpntcp"`
+	} `json:"servers"`
+}
+
+type serverData struct {
+	IP netip.Addr `json:"ip"`
+	CN string     `json:"cn"`
+}
+
+func fetchAPI(ctx context.Context, client *http.Client) (
+	data apiData, err error,
+) {
+	const url = "https://serverlist.piaservers.net/vpninfo/servers/v7"
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return data, err
+	}
+
+	response, err := client.Do(request)
+	if err != nil {
+		return data, err
+	}
+	defer response.Body.Close()
+
+	if response.StatusCode != http.StatusOK {
+		return data, fmt.Errorf("%w: %d %s", ErrHTTPStatusCodeNotOK,
+			response.StatusCode, response.Status)
+	}
+
+	b, err := io.ReadAll(response.Body)
+	if err != nil {
+		return data, err
+	}
+
+	if err := response.Body.Close(); err != nil {
+		return data, err
+	}
+
+	// remove key/signature at the bottom
+	i := bytes.IndexRune(b, '\n')
+	b = b[:i]
+
+	if err := json.Unmarshal(b, &data); err != nil {
+		return data, err
+	}
+
+	return data, nil
+}

pkg/updaters/privateinternetaccess/hosttoserver.go

@@ -0,0 +1,58 @@
+package privateinternetaccess
+
+import (
+	"net/netip"
+
+	"github.com/qdm12/gluetun/internal/constants/vpn"
+	"github.com/qdm12/gluetun/internal/models"
+)
+
+type nameToServer map[string]models.Server
+
+func (nts nameToServer) add(name, hostname, region string,
+	tcp, udp, portForward bool, ip netip.Addr,
+) (change bool) {
+	server, ok := nts[name]
+	if !ok {
+		change = true
+		server.VPN = vpn.OpenVPN
+		server.ServerName = name
+		server.Hostname = hostname
+		server.Region = region
+		server.PortForward = portForward
+	}
+
+	if !server.TCP && tcp {
+		change = true
+		server.TCP = tcp
+	}
+	if !server.UDP && udp {
+		change = true
+		server.UDP = udp
+	}
+
+	ipFound := false
+	for _, existingIP := range server.IPs {
+		if ip == existingIP {
+			ipFound = true
+			break
+		}
+	}
+
+	if !ipFound {
+		change = true
+		server.IPs = append(server.IPs, ip)
+	}
+
+	nts[name] = server
+
+	return change
+}
+
+func (nts nameToServer) toServersSlice() (servers []models.Server) {
+	servers = make([]models.Server, 0, len(nts))
+	for _, server := range nts {
+		servers = append(servers, server)
+	}
+	return servers
+}

pkg/updaters/privateinternetaccess/servers.go

@@ -0,0 +1,99 @@
+package privateinternetaccess
+
+import (
+	"context"
+	"fmt"
+	"sort"
+	"time"
+
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/common"
+)
+
+func (u *Updater) FetchServers(ctx context.Context, minServers int) (
+	servers []models.Server, err error,
+) {
+	nts := make(nameToServer)
+
+	noChangeCounter := 0
+	const maxNoChange = 10
+	const betweenDuration = 200 * time.Millisecond
+	const maxDuration = time.Minute
+
+	maxTimer := time.NewTimer(maxDuration)
+
+	for {
+		data, err := fetchAPI(ctx, u.client)
+		if err != nil {
+			return nil, err
+		}
+
+		change := addData(data.Regions, nts)
+
+		if !change {
+			noChangeCounter++
+			if noChangeCounter == maxNoChange {
+				break
+			}
+		} else {
+			noChangeCounter = 0
+		}
+
+		timer := time.NewTimer(betweenDuration)
+		maxTimeout := false
+		select {
+		case <-ctx.Done():
+			if !timer.Stop() {
+				<-timer.C
+			}
+			if !maxTimer.Stop() {
+				<-timer.C
+			}
+			return nil, ctx.Err()
+		case <-timer.C:
+		case <-maxTimer.C:
+			if !timer.Stop() {
+				<-timer.C
+			}
+			maxTimeout = true
+		}
+
+		if maxTimeout {
+			break
+		}
+	}
+
+	servers = nts.toServersSlice()
+
+	if len(servers) < minServers {
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
+			common.ErrNotEnoughServers, len(servers), minServers)
+	}
+
+	sort.Sort(models.SortableServers(servers))
+
+	return servers, nil
+}
+
+func addData(regions []regionData, nts nameToServer) (change bool) {
+	for _, region := range regions {
+		if region.Offline {
+			continue
+		}
+		for _, server := range region.Servers.UDP {
+			const tcp, udp = false, true
+			if nts.add(server.CN, region.DNS, region.Name, tcp, udp, region.PortForward, server.IP) {
+				change = true
+			}
+		}
+
+		for _, server := range region.Servers.TCP {
+			const tcp, udp = true, false
+			if nts.add(server.CN, region.DNS, region.Name, tcp, udp, region.PortForward, server.IP) {
+				change = true
+			}
+		}
+	}
+
+	return change
+}

pkg/updaters/privateinternetaccess/updater.go

@@ -0,0 +1,19 @@
+package privateinternetaccess
+
+import (
+	"net/http"
+)
+
+type Updater struct {
+	client *http.Client
+}
+
+func New(client *http.Client) *Updater {
+	return &Updater{
+		client: client,
+	}
+}
+
+func (u *Updater) Version() uint16 {
+	return 1
+}