remove thinGeoData

Author: yiguo

build/template/main.go

@@ -44,12 +44,6 @@ func CGoCountGeoData(base64Text *C.char) *C.char {
 	return C.CString(CountGeoData(text))
 }
 
-//export CGoThinGeoData
-func CGoThinGeoData(base64Text *C.char) *C.char {
-	text := C.GoString(base64Text)
-	return C.CString(ThinGeoData(text))
-}
-
 //export CGoReadGeoFiles
 func CGoReadGeoFiles(base64Text *C.char) *C.char {
 	text := C.GoString(base64Text)

geo/read.go

@@ -1,5 +1,13 @@
 package geo
 
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/xtls/xray-core/infra/conf"
+)
+
 // Read all geo files in config file.
 // configPath means where xray config file is.
 func ReadGeoFiles(xrayBytes []byte) ([]string, []string) {
@@ -18,3 +26,109 @@ func ReadGeoFiles(xrayBytes []byte) ([]string, []string) {
 
 	return domainFiles, ipFiles
 }
+
+func loadXrayConfig(configBytes []byte) ([]string, []string) {
+	domain := []string{}
+	ip := []string{}
+
+	var xray *conf.Config
+	err := json.Unmarshal(configBytes, &xray)
+	if err != nil {
+		return domain, ip
+	}
+
+	routingDomain, routingIP := filterRouting(xray)
+	domain = append(domain, routingDomain...)
+	ip = append(ip, routingIP...)
+
+	dnsDomain, dnsIP := filterDns(xray)
+	domain = append(domain, dnsDomain...)
+	ip = append(ip, dnsIP...)
+
+	return domain, ip
+}
+
+func filterRouting(xray *conf.Config) ([]string, []string) {
+	domain := []string{}
+	ip := []string{}
+
+	routing := xray.RouterConfig
+	if routing == nil {
+		return domain, ip
+	}
+	rules := routing.RuleList
+	if len(rules) == 0 {
+		return domain, ip
+	}
+	// parse rules
+	// we only care about domain and ip
+	type RawRule struct {
+		Domain *conf.StringList `json:"domain"`
+		IP     *conf.StringList `json:"ip"`
+	}
+
+	for _, rule := range rules {
+		var rawRule RawRule
+		err := json.Unmarshal(rule, &rawRule)
+		if err != nil {
+			continue
+		}
+		if rawRule.Domain != nil {
+			domain = append(domain, *rawRule.Domain...)
+		}
+		if rawRule.IP != nil {
+			ip = append(ip, *rawRule.IP...)
+		}
+	}
+	return domain, ip
+}
+
+func filterDns(xray *conf.Config) ([]string, []string) {
+	domain := []string{}
+	ip := []string{}
+
+	dns := xray.DNSConfig
+	if dns == nil {
+		return domain, ip
+	}
+	servers := dns.Servers
+	if len(servers) == 0 {
+		return domain, ip
+	}
+
+	for _, server := range servers {
+		if len(server.Domains) > 0 {
+			domain = append(domain, server.Domains...)
+		}
+		if len(server.ExpectIPs) > 0 {
+			ip = append(ip, server.ExpectIPs...)
+		}
+	}
+	return domain, ip
+}
+
+func filterAndStrip(rules []string, retain string) map[string][]string {
+	m := make(map[string][]string)
+	retainPrefix := fmt.Sprintf("%s:", retain)
+	retainFile := fmt.Sprintf("%s.dat", retain)
+	for _, rule := range rules {
+		if strings.HasPrefix(rule, retainPrefix) {
+			values := strings.SplitN(rule, ":", 2)
+			appendMap(m, retainFile, values[1])
+		} else if strings.HasPrefix(rule, "ext:") {
+			values := strings.SplitN(rule, ":", 3)
+			appendMap(m, values[1], values[2])
+		}
+	}
+	return m
+}
+
+func appendMap(m map[string][]string, key string, value string) {
+	v, ok := m[key]
+	if ok {
+		v = append(v, value)
+	} else {
+		v = []string{value}
+	}
+	m[key] = v
+}

geo/thin.go

@@ -32,28 +32,6 @@ func CountGeoData(base64Text string) string {
 	return response.EncodeToBase64("", err)
 }
 
-type ThinGeoDataRequest struct {
-	DatDir     string `json:"datDir,omitempty"`
-	ConfigPath string `json:"configPath,omitempty"`
-	DstDir     string `json:"dstDir,omitempty"`
-}
-
-// thin geo data
-func ThinGeoData(base64Text string) string {
-	var response nodep.CallResponse[string]
-	req, err := base64.StdEncoding.DecodeString(base64Text)
-	if err != nil {
-		return response.EncodeToBase64("", err)
-	}
-	var request ThinGeoDataRequest
-	err = json.Unmarshal(req, &request)
-	if err != nil {
-		return response.EncodeToBase64("", err)
-	}
-	err = geo.ThinGeoData(request.DatDir, request.ConfigPath, request.DstDir)
-	return response.EncodeToBase64("", err)
-}
-
 type readGeoFilesResponse struct {
 	Domain []string `json:"domain,omitempty"`
 	IP     []string `json:"ip,omitempty"`