Chore: refine reading MMDB file

go.mod

@@ -5,6 +5,7 @@ go 1.23
 toolchain go1.23.2
 
 require (
+	github.com/oschwald/geoip2-golang v1.11.0
 	github.com/oschwald/maxminddb-golang v1.13.1
 	github.com/tailscale/hujson v0.0.0-20241010212012-29efb4a0184b
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba

go.sum

@@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/oschwald/geoip2-golang v1.11.0 h1:hNENhCn1Uyzhf9PTmquXENiWS6AlxAEnBII6r8krA3w=
+github.com/oschwald/geoip2-golang v1.11.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
 github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
 github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

plugin/maxmind/mmdb_in.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/oschwald/geoip2-golang"
 	"github.com/oschwald/maxminddb-golang"
 	"github.com/v2fly/geoip/lib"
 )
@@ -143,21 +144,10 @@ func (m *maxmindMMDBIn) generateEntries(content []byte, entries map[string]*lib.
 
 	networks := db.Networks(maxminddb.SkipAliasedNetworks)
 	for networks.Next() {
-		record := struct {
-			Country struct {
-				IsoCode string `maxminddb:"iso_code"`
-			} `maxminddb:"country"`
-			RegisteredCountry struct {
-				IsoCode string `maxminddb:"iso_code"`
-			} `maxminddb:"registered_country"`
-			RepresentedCountry struct {
-				IsoCode string `maxminddb:"iso_code"`
-			} `maxminddb:"represented_country"`
-		}{}
-
+		var record geoip2.Country
 		subnet, err := networks.Network(&record)
 		if err != nil {
-			continue
+			return err
 		}
 
 		name := ""