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

internal/provider/windscribe/provider.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/qdm12/gluetun/internal/constants/providers"
 	"github.com/qdm12/gluetun/internal/provider/common"
-	"github.com/qdm12/gluetun/internal/provider/windscribe/updater"
+	"github.com/qdm12/gluetun/pkg/updaters/windscribe"
 )
 
 type Provider struct {
@@ -21,7 +21,7 @@ func New(storage common.Storage, randSource rand.Source,
 	return &Provider{
 		storage:    storage,
 		randSource: randSource,
-		Fetcher:    updater.New(client, updaterWarner),
+		Fetcher:    windscribe.New(client, updaterWarner),
 	}
 }
 

internal/provider/windscribe/updater/api.go

@@ -1,68 +0,0 @@
-package updater
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/netip"
-	"strconv"
-	"time"
-)
-
-var ErrHTTPStatusCodeNotOK = errors.New("HTTP status code not OK")
-
-type apiData struct {
-	Data []regionData `json:"data"`
-}
-
-type regionData struct {
-	Region string      `json:"name"`
-	Groups []groupData `json:"groups"`
-}
-
-type groupData struct {
-	City     string       `json:"city"`
-	Nodes    []serverData `json:"nodes"`
-	OvpnX509 string       `json:"ovpn_x509"`
-	WgPubKey string       `json:"wg_pubkey"`
-}
-
-type serverData struct {
-	Hostname string     `json:"hostname"`
-	IP       netip.Addr `json:"ip"`
-	IP2      netip.Addr `json:"ip2"`
-	IP3      netip.Addr `json:"ip3"`
-}
-
-func fetchAPI(ctx context.Context, client *http.Client) (
-	data apiData, err error,
-) {
-	const baseURL = "https://assets.windscribe.com/serverlist/mob-v2/1/"
-	cacheBreaker := time.Now().Unix()
-	url := baseURL + strconv.Itoa(int(cacheBreaker))
-
-	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)
-	}
-
-	decoder := json.NewDecoder(response.Body)
-	if err := decoder.Decode(&data); err != nil {
-		return data, fmt.Errorf("decoding response body: %w", err)
-	}
-
-	return data, nil
-}

internal/provider/windscribe/updater/servers.go

@@ -1,76 +0,0 @@
-package updater
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/netip"
-	"sort"
-
-	"github.com/qdm12/gluetun/internal/constants/vpn"
-	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/gluetun/internal/provider/common"
-)
-
-var ErrNoWireguardKey = errors.New("no wireguard public key found")
-
-func (u *Updater) FetchServers(ctx context.Context, minServers int) (
-	servers []models.Server, err error,
-) {
-	data, err := fetchAPI(ctx, u.client)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, regionData := range data.Data {
-		region := regionData.Region
-		for _, group := range regionData.Groups {
-			city := group.City
-			x5090Name := group.OvpnX509
-			wgPubKey := group.WgPubKey
-			for _, node := range group.Nodes {
-				ips := make([]netip.Addr, 0, 2) //nolint:mnd
-				if node.IP.IsValid() {
-					ips = append(ips, node.IP)
-				}
-				if node.IP2.IsValid() {
-					ips = append(ips, node.IP2)
-				}
-				server := models.Server{
-					VPN:      vpn.OpenVPN,
-					TCP:      true,
-					UDP:      true,
-					Region:   region,
-					City:     city,
-					Hostname: node.Hostname,
-					OvpnX509: x5090Name,
-					IPs:      ips,
-				}
-				servers = append(servers, server)
-
-				if !node.IP3.IsValid() { // Wireguard + Stealth
-					continue
-				} else if wgPubKey == "" {
-					return nil, fmt.Errorf("%w: for node %s", ErrNoWireguardKey, node.Hostname)
-				}
-
-				server.VPN = vpn.Wireguard
-				server.UDP = false
-				server.TCP = false
-				server.OvpnX509 = ""
-				server.WgPubKey = wgPubKey
-				server.IPs = []netip.Addr{node.IP3}
-				servers = append(servers, server)
-			}
-		}
-	}
-
-	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
-}

internal/provider/windscribe/updater/updater.go

@@ -1,19 +0,0 @@
-package updater
-
-import (
-	"net/http"
-
-	"github.com/qdm12/gluetun/internal/provider/common"
-)
-
-type Updater struct {
-	client *http.Client
-	warner common.Warner
-}
-
-func New(client *http.Client, warner common.Warner) *Updater {
-	return &Updater{
-		client: client,
-		warner: warner,
-	}
-}