Maint: internal/vpn package for vpn loop

internal/vpn/state/servers.go

@@ -0,0 +1,20 @@
+package state
+
+import "github.com/qdm12/gluetun/internal/models"
+
+type ServersGetterSetter interface {
+	GetServers() (servers models.AllServers)
+	SetServers(servers models.AllServers)
+}
+
+func (s *State) GetServers() (servers models.AllServers) {
+	s.allServersMu.RLock()
+	defer s.allServersMu.RUnlock()
+	return s.allServers
+}
+
+func (s *State) SetServers(servers models.AllServers) {
+	s.allServersMu.Lock()
+	defer s.allServersMu.Unlock()
+	s.allServers = servers
+}

internal/vpn/state/state.go

@@ -0,0 +1,52 @@
+package state
+
+import (
+	"sync"
+
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/loopstate"
+	"github.com/qdm12/gluetun/internal/models"
+)
+
+var _ Manager = (*State)(nil)
+
+type Manager interface {
+	SettingsGetSetter
+	ServersGetterSetter
+	GetSettingsAndServers() (vpn configuration.VPN,
+		provider configuration.Provider, allServers models.AllServers)
+}
+
+func New(statusApplier loopstate.Applier,
+	vpn configuration.VPN, provider configuration.Provider,
+	allServers models.AllServers) *State {
+	return &State{
+		statusApplier: statusApplier,
+		vpn:           vpn,
+		provider:      provider,
+		allServers:    allServers,
+	}
+}
+
+type State struct {
+	statusApplier loopstate.Applier
+
+	vpn        configuration.VPN
+	provider   configuration.Provider
+	settingsMu sync.RWMutex
+
+	allServers   models.AllServers
+	allServersMu sync.RWMutex
+}
+
+func (s *State) GetSettingsAndServers() (vpn configuration.VPN,
+	provider configuration.Provider, allServers models.AllServers) {
+	s.settingsMu.RLock()
+	s.allServersMu.RLock()
+	vpn = s.vpn
+	provider = s.provider
+	allServers = s.allServers
+	s.settingsMu.RUnlock()
+	s.allServersMu.RUnlock()
+	return vpn, provider, allServers
+}

internal/vpn/state/vpn.go

@@ -0,0 +1,43 @@
+package state
+
+import (
+	"context"
+	"reflect"
+
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/constants"
+)
+
+type SettingsGetSetter interface {
+	GetSettings() (vpn configuration.VPN,
+		provider configuration.Provider)
+	SetSettings(ctx context.Context, vpn configuration.VPN,
+		provider configuration.Provider) (outcome string)
+}
+
+func (s *State) GetSettings() (vpn configuration.VPN,
+	provider configuration.Provider) {
+	s.settingsMu.RLock()
+	vpn = s.vpn
+	provider = s.provider
+	s.settingsMu.RUnlock()
+	return vpn, provider
+}
+
+func (s *State) SetSettings(ctx context.Context,
+	vpn configuration.VPN, provider configuration.Provider) (
+	outcome string) {
+	s.settingsMu.Lock()
+	settingsUnchanged := reflect.DeepEqual(s.vpn, vpn) &&
+		reflect.DeepEqual(s.provider, provider)
+	if settingsUnchanged {
+		s.settingsMu.Unlock()
+		return "settings left unchanged"
+	}
+	s.vpn = vpn
+	s.provider = provider
+	s.settingsMu.Unlock()
+	_, _ = s.statusApplier.ApplyStatus(ctx, constants.Stopped)
+	outcome, _ = s.statusApplier.ApplyStatus(ctx, constants.Running)
+	return outcome
+}