chore(all): Providers containing all provider objects
- Share the same providers for updater and vpn - Initialise all providers at start - Get from `Providers` instead of constructing on every run
This commit is contained in:
@@ -52,14 +52,14 @@ type Logger interface {
|
||||
Error(s string)
|
||||
}
|
||||
|
||||
func NewLooper(settings settings.Updater, storage updater.Storage,
|
||||
client *http.Client, logger Logger) Looper {
|
||||
func NewLooper(settings settings.Updater, providers updater.Providers,
|
||||
storage updater.Storage, client *http.Client, logger Logger) Looper {
|
||||
return &looper{
|
||||
state: state{
|
||||
status: constants.Stopped,
|
||||
settings: settings,
|
||||
},
|
||||
updater: updater.New(client, storage, logger),
|
||||
updater: updater.New(client, storage, providers, logger),
|
||||
logger: logger,
|
||||
start: make(chan struct{}),
|
||||
running: make(chan models.LoopStatus),
|
||||
|
||||
@@ -15,6 +15,8 @@ import (
|
||||
)
|
||||
|
||||
type Updater struct {
|
||||
providers Providers
|
||||
|
||||
// state
|
||||
storage Storage
|
||||
|
||||
@@ -25,6 +27,10 @@ type Updater struct {
|
||||
unzipper unzip.Unzipper
|
||||
}
|
||||
|
||||
type Providers interface {
|
||||
Get(providerName string) provider.Provider
|
||||
}
|
||||
|
||||
type Storage interface {
|
||||
SetServers(provider string, servers []models.Server) (err error)
|
||||
GetServersCount(provider string) (count int)
|
||||
@@ -40,15 +46,16 @@ type Logger interface {
|
||||
Error(s string)
|
||||
}
|
||||
|
||||
func New(httpClient *http.Client,
|
||||
storage Storage, logger Logger) *Updater {
|
||||
func New(httpClient *http.Client, storage Storage,
|
||||
providers Providers, logger Logger) *Updater {
|
||||
unzipper := unzip.New(httpClient)
|
||||
return &Updater{
|
||||
storage: storage,
|
||||
logger: logger,
|
||||
timeNow: time.Now,
|
||||
client: httpClient,
|
||||
unzipper: unzipper,
|
||||
providers: providers,
|
||||
storage: storage,
|
||||
logger: logger,
|
||||
timeNow: time.Now,
|
||||
client: httpClient,
|
||||
unzipper: unzipper,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,9 +64,7 @@ func (u *Updater) UpdateServers(ctx context.Context, providers []string) (err er
|
||||
for _, providerName := range providers {
|
||||
u.logger.Info("updating " + caser.String(providerName) + " servers...")
|
||||
|
||||
fetcherStorage := (Storage)(nil) // unused
|
||||
fetcher := provider.New(providerName, fetcherStorage, u.timeNow,
|
||||
u.logger, u.client, u.unzipper)
|
||||
fetcher := u.providers.Get(providerName)
|
||||
// TODO support servers offering only TCP or only UDP
|
||||
// for NordVPN and PureVPN
|
||||
err := u.updateProvider(ctx, fetcher)
|
||||
|
||||
Reference in New Issue
Block a user