Improve mirror selection logic in Closest with full-server fallback

config.go

@@ -47,6 +47,9 @@
 	// CheckURL is the url used to verify mirror versions
 	CheckURL string `mapstructure:"checkUrl"`
 
+	// SameCityThreshold is the parameter used to specify a threshold between mirrors and the client
+	SameCityThreshold float64 `mapstructure:"sameCityThreshold"`
+
 	// ServerList is a list of ServerConfig structs, which gets parsed into servers.
 	ServerList []ServerConfig `mapstructure:"servers"`
 
@@ -79,7 +82,7 @@
 	}
 }
 
 func Remove[V comparable](collection []V, value V) []V {
 	return lo.Filter(collection, func(item V, _ int) bool {
 		return item != value
 	})
@@ -94,30 +97,26 @@
 	// Load maxmind database
 	if r.db != nil {
 		err = r.db.Close()
-
 		if err != nil {
 			return errors.Wrap(err, "Unable to close database")
 		}
 	}
 
 	if r.asnDB != nil {
 		err = r.asnDB.Close()
-
 		if err != nil {
 			return errors.Wrap(err, "Unable to close asn database")
 		}
 	}
 
 	// db can be hot-reloaded if the file changed
 	r.db, err = maxminddb.Open(r.config.GeoDBPath)
-
 	if err != nil {
 		return errors.Wrap(err, "Unable to open database")
 	}
 
 	if r.config.ASNDBPath != "" {
 		r.asnDB, err = maxminddb.Open(r.config.ASNDBPath)
-
 		if err != nil {
 			return errors.Wrap(err, "Unable to open asn database")
 		}
@@ -145,21 +144,16 @@
 
 	// Create mirror map
 	mirrors := make(map[string][]*Server)
-
 	for _, server := range r.servers {
 		mirrors[server.Continent] = append(mirrors[server.Continent], server)
 	}
-
 	mirrors["default"] = append(mirrors["NA"], mirrors["EU"]...)
-
 	r.regionMap = mirrors
 
 	hosts := make(map[string]*Server)
-
 	for _, server := range r.servers {
 		hosts[server.Host] = server
 	}
-
 	r.hostMap = hosts
 
 	// Check top choices size
@@ -169,6 +163,11 @@
 		r.config.TopChoices = len(r.servers)
 	}
 
+    // Check if on the config is declared or use default logic
+	if r.config.SameCityThreshold == 0 {
+		r.config.SameCityThreshold = 200000.0
+	}
+
 	// Force check
 	go r.servers.Check(r, r.checks)
 
@@ -180,26 +179,20 @@
 	var wg sync.WaitGroup
 
 	existing := make(map[string]int)
-
 	for i, server := range r.servers {
 		existing[server.Host] = i
 	}
 
 	hosts := make(map[string]bool)
-
 	var hostsLock sync.Mutex
 
 	for _, server := range r.config.ServerList {
 		wg.Add(1)
-
 		var prefix string
-
 		if !strings.HasPrefix(server.Server, "http") {
 			prefix = "https://"
 		}
-
 		u, err := url.Parse(prefix + server.Server)
-
 		if err != nil {
 			log.WithFields(log.Fields{
 				"error":  err,
@@ -209,42 +202,35 @@
 		}
 
 		i := -1
-
 		if v, exists := existing[u.Host]; exists {
 			i = v
 		}
 
 		go func(i int, server ServerConfig, u *url.URL) {
 			defer wg.Done()
-
 			s, err := r.addServer(server, u)
-
 			if err != nil {
 				log.WithError(err).Warning("Unable to add server")
 				return
 			}
-
 			hostsLock.Lock()
 			hosts[u.Host] = true
 			hostsLock.Unlock()
-
 			if _, ok := existing[u.Host]; ok {
 				s.Redirects = r.servers[i].Redirects
-
 				r.servers[i] = s
 			} else {
 				s.Redirects = promauto.NewCounter(prometheus.CounterOpts{
 					Name: "armbian_router_redirects_" + metricReplacer.Replace(u.Host),
 					Help: "The number of redirects for server " + u.Host,
 				})
-
 				r.servers = append(r.servers, s)
-
 				log.WithFields(log.Fields{
 					"server":    u.Host,
 					"path":      u.Path,
 					"latitude":  s.Latitude,
 					"longitude": s.Longitude,
+					"country": s.Country,
 				}).Info("Added server")
 			}
 		}(i, server, u)
@@ -257,11 +243,9 @@
 		if _, exists := hosts[r.servers[i].Host]; exists {
 			continue
 		}
-
 		log.WithFields(log.Fields{
 			"server": r.servers[i].Host,
 		}).Info("Removed server")
-
 		r.servers = append(r.servers[:i], r.servers[i+1:]...)
 	}
 
@@ -284,33 +268,27 @@
 		Protocols: []string{"http", "https"},
 		Rules:     server.Rules,
 	}
-
 	if len(server.Protocols) > 0 {
 		for _, proto := range server.Protocols {
 			if !lo.Contains(s.Protocols, proto) {
 				s.Protocols = append(s.Protocols, proto)
 			}
 		}
 	}
-
 	// Defaults to 10 to allow servers to be set lower for lower priority
 	if s.Weight == 0 {
 		s.Weight = 10
 	}
-
 	ips, err := net.LookupIP(u.Host)
-
 	if err != nil {
 		log.WithFields(log.Fields{
 			"error":  err,
 			"server": s.Host,
 		}).Warning("Could not resolve address")
 		return nil, err
 	}
-
 	var city db.City
 	err = r.db.Lookup(ips[0], &city)
-
 	if err != nil {
 		log.WithFields(log.Fields{
 			"error":  err,
@@ -319,35 +297,27 @@
 		}).Warning("Could not geolocate address")
 		return nil, err
 	}
-
+	s.Country = city.Country.IsoCode
 	if s.Continent == "" {
 		s.Continent = city.Continent.Code
 	}
-
 	if s.Latitude == 0 && s.Longitude == 0 {
 		s.Latitude = city.Location.Latitude
 		s.Longitude = city.Location.Longitude
 	}
-
 	return s, nil
 }
 
 func (r *Redirector) reloadMap() error {
 	mapFile := r.config.MapFile
-
 	if mapFile == "" {
 		return nil
 	}
-
 	log.WithField("file", mapFile).Info("Loading download map")
-
 	newMap, err := loadMapFile(mapFile)
-
 	if err != nil {
 		return err
 	}
-
 	r.dlMap = newMap
-
 	return nil
 }

dlrouter.yaml

@@ -3,6 +3,8 @@ geodb: GeoLite2-City.mmdb
 asndb: GeoLite2-ASN.mmdb
 dl_map: userdata.csv
 
+sameCityThreshold: 200000.0
+
 checkUrl: https://imola.armbian.com/apt/.control
 
 # LRU Cache Size (in items)