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:
Quentin McGaw
2022-06-10 00:47:56 +00:00
parent ebd94723c1
commit 0378fe4a7b
9 changed files with 136 additions and 112 deletions

View File

@@ -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)