feat: full geoip/geosite support

app/internal/utils/geoip.go

@@ -1,70 +0,0 @@
-package utils
-
-import (
-	"io"
-	"net/http"
-	"os"
-
-	"github.com/oschwald/geoip2-golang"
-)
-
-const (
-	geoipDefaultFilename = "GeoLite2-Country.mmdb"
-	geoipDownloadURL     = "https://git.io/GeoLite2-Country.mmdb"
-)
-
-// GeoIPLoader provides the on-demand GeoIP database loading function required by the ACL engine.
-type GeoIPLoader struct {
-	Filename        string
-	DownloadFunc    func(filename, url string) // Called when downloading the GeoIP database.
-	DownloadErrFunc func(err error)            // Called when downloading the GeoIP database succeeds/fails.
-
-	db *geoip2.Reader
-}
-
-func (l *GeoIPLoader) download() error {
-	resp, err := http.Get(geoipDownloadURL)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	f, err := os.Create(geoipDefaultFilename)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = io.Copy(f, resp.Body)
-	return err
-}
-
-func (l *GeoIPLoader) Load() *geoip2.Reader {
-	if l.db == nil {
-		if l.Filename == "" {
-			// Filename not specified, try default.
-			if _, err := os.Stat(geoipDefaultFilename); err == nil {
-				// Default already exists, just use it.
-				l.Filename = geoipDefaultFilename
-			} else if os.IsNotExist(err) {
-				// Default doesn't exist, download it.
-				l.DownloadFunc(geoipDefaultFilename, geoipDownloadURL)
-				err := l.download()
-				l.DownloadErrFunc(err)
-				if err != nil {
-					return nil
-				}
-				l.Filename = geoipDefaultFilename
-			} else {
-				// Other error
-				return nil
-			}
-		}
-		db, err := geoip2.Open(l.Filename)
-		if err != nil {
-			return nil
-		}
-		l.db = db
-	}
-	return l.db
-}

app/internal/utils/geoloader.go

@@ -0,0 +1,107 @@
+package utils
+
+import (
+	"io"
+	"net/http"
+	"os"
+
+	"github.com/apernet/hysteria/extras/outbounds/acl"
+	"github.com/apernet/hysteria/extras/outbounds/acl/v2geo"
+)
+
+const (
+	geoipFilename   = "geoip.dat"
+	geoipURL        = "https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat"
+	geositeFilename = "geosite.dat"
+	geositeURL      = "https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat"
+)
+
+var _ acl.GeoLoader = (*GeoLoader)(nil)
+
+// GeoLoader provides the on-demand GeoIP/GeoSite database
+// loading functionality required by the ACL engine.
+// Empty filenames = automatic download from built-in URLs.
+type GeoLoader struct {
+	GeoIPFilename   string
+	GeoSiteFilename string
+
+	DownloadFunc    func(filename, url string)
+	DownloadErrFunc func(err error)
+
+	geoipMap   map[string]*v2geo.GeoIP
+	geositeMap map[string]*v2geo.GeoSite
+}
+
+func (l *GeoLoader) download(filename, url string) error {
+	l.DownloadFunc(filename, url)
+
+	resp, err := http.Get(url)
+	if err != nil {
+		l.DownloadErrFunc(err)
+		return err
+	}
+	defer resp.Body.Close()
+
+	f, err := os.Create(filename)
+	if err != nil {
+		l.DownloadErrFunc(err)
+		return err
+	}
+	defer f.Close()
+
+	_, err = io.Copy(f, resp.Body)
+	l.DownloadErrFunc(err)
+	return err
+}
+
+func (l *GeoLoader) LoadGeoIP() (map[string]*v2geo.GeoIP, error) {
+	if l.geoipMap != nil {
+		return l.geoipMap, nil
+	}
+	autoDL := false
+	filename := l.GeoIPFilename
+	if filename == "" {
+		autoDL = true
+		filename = geoipFilename
+	}
+	m, err := v2geo.LoadGeoIP(filename)
+	if os.IsNotExist(err) && autoDL {
+		// It's ok, we will download it.
+		err = l.download(filename, geoipURL)
+		if err != nil {
+			return nil, err
+		}
+		m, err = v2geo.LoadGeoIP(filename)
+	}
+	if err != nil {
+		return nil, err
+	}
+	l.geoipMap = m
+	return m, nil
+}
+
+func (l *GeoLoader) LoadGeoSite() (map[string]*v2geo.GeoSite, error) {
+	if l.geositeMap != nil {
+		return l.geositeMap, nil
+	}
+	autoDL := false
+	filename := l.GeoSiteFilename
+	if filename == "" {
+		autoDL = true
+		filename = geositeFilename
+	}
+	m, err := v2geo.LoadGeoSite(filename)
+	if os.IsNotExist(err) && autoDL {
+		// It's ok, we will download it.
+		err = l.download(filename, geositeURL)
+		if err != nil {
+			return nil, err
+		}
+		m, err = v2geo.LoadGeoSite(filename)
+	}
+	if err != nil {
+		return nil, err
+	}
+	l.geositeMap = m
+	return m, nil
+}