chore(all): memory and thread safe storage

- settings: get filter choices from storage for settings validation
- updater: update servers to the storage
- storage: minimal deep copying and data duplication
- storage: add merged servers mutex for thread safety
- connection: filter servers in storage
- formatter: format servers to Markdown in storage
- PIA: get server by name from storage directly
- Updater: get servers count from storage directly
- Updater: equality check done in storage, fix #882

internal/vpn/loop.go

@@ -27,12 +27,12 @@ type Looper interface {
 	loopstate.Getter
 	loopstate.Applier
 	SettingsGetSetter
-	ServersGetterSetter
 }
 
 type Loop struct {
 	statusManager loopstate.Manager
 	state         state.Manager
+	storage       Storage
 	// Fixed parameters
 	buildInfo     models.BuildInformation
 	versionInfo   bool
@@ -64,12 +64,17 @@ type firewallConfigurer interface {
 	firewall.PortAllower
 }
 
+type Storage interface {
+	FilterServers(provider string, selection settings.ServerSelection) (servers []models.Server, err error)
+	GetServerByName(provider, name string) (server models.Server, ok bool)
+}
+
 const (
 	defaultBackoffTime = 15 * time.Second
 )
 
 func NewLoop(vpnSettings settings.VPN, vpnInputPorts []uint16,
-	allServers models.AllServers, openvpnConf openvpn.Interface,
+	storage Storage, openvpnConf openvpn.Interface,
 	netLinker netlink.NetLinker, fw firewallConfigurer, routing routing.VPNGetter,
 	portForward portforward.StartStopper, starter command.Starter,
 	publicip publicip.Looper, dnsLooper dns.Looper,
@@ -81,11 +86,12 @@ func NewLoop(vpnSettings settings.VPN, vpnInputPorts []uint16,
 	stopped := make(chan struct{})
 
 	statusManager := loopstate.New(constants.Stopped, start, running, stop, stopped)
-	state := state.New(statusManager, vpnSettings, allServers)
+	state := state.New(statusManager, vpnSettings)
 
 	return &Loop{
 		statusManager: statusManager,
 		state:         state,
+		storage:       storage,
 		buildInfo:     buildInfo,
 		versionInfo:   versionInfo,
 		vpnInputPorts: vpnInputPorts,

internal/vpn/run.go

@@ -28,9 +28,9 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 	}
 
 	for ctx.Err() == nil {
-		settings, allServers := l.state.GetSettingsAndServers()
+		settings := l.state.GetSettings()
 
-		providerConf := provider.New(*settings.Provider.Name, allServers, time.Now)
+		providerConf := provider.New(*settings.Provider.Name, l.storage, time.Now)
 
 		portForwarding := *settings.Provider.PortForwarding.Enabled
 		var vpnRunner vpnRunner

internal/vpn/servers.go

@@ -1,16 +0,0 @@
-package vpn
-
-import (
-	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/gluetun/internal/vpn/state"
-)
-
-type ServersGetterSetter = state.ServersGetterSetter
-
-func (l *Loop) GetServers() (servers models.AllServers) {
-	return l.state.GetServers()
-}
-
-func (l *Loop) SetServers(servers models.AllServers) {
-	l.state.SetServers(servers)
-}

internal/vpn/state/servers.go

@@ -1,20 +0,0 @@
-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

@@ -5,23 +5,18 @@ import (
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/loopstate"
-	"github.com/qdm12/gluetun/internal/models"
 )
 
 var _ Manager = (*State)(nil)
 
 type Manager interface {
 	SettingsGetSetter
-	ServersGetterSetter
-	GetSettingsAndServers() (vpn settings.VPN, allServers models.AllServers)
 }
 
-func New(statusApplier loopstate.Applier,
-	vpn settings.VPN, allServers models.AllServers) *State {
+func New(statusApplier loopstate.Applier, vpn settings.VPN) *State {
 	return &State{
 		statusApplier: statusApplier,
 		vpn:           vpn,
-		allServers:    allServers,
 	}
 }
 
@@ -30,18 +25,4 @@ type State struct {
 
 	vpn        settings.VPN
 	settingsMu sync.RWMutex
-
-	allServers   models.AllServers
-	allServersMu sync.RWMutex
-}
-
-func (s *State) GetSettingsAndServers() (vpn settings.VPN,
-	allServers models.AllServers) {
-	s.settingsMu.RLock()
-	s.allServersMu.RLock()
-	vpn = s.vpn
-	allServers = s.allServers
-	s.settingsMu.RUnlock()
-	s.allServersMu.RUnlock()
-	return vpn, allServers
 }