Fix: matching type mismatch

Author: JimhHan

common/matcher/geosite/geosite.go

@@ -15,5 +15,19 @@ func ToDomains(dms []*Domain) []*domain.Domain {
 }
 
 func (d *Domain) ToDomain() *domain.Domain {
-	return &domain.Domain{Type: d.Type, Value: d.Value}
+	return &domain.Domain{Type: d.Type.ToMatchingType(), Value: d.Value}
+}
+
+func (t Domain_Type) ToMatchingType() domain.MatchingType {
+	switch t {
+	case Domain_Plain:
+		return domain.MatchingType_Keyword
+	case Domain_Regex:
+		return domain.MatchingType_Regex
+	case Domain_Domain:
+		return domain.MatchingType_Subdomain
+	case Domain_Full:
+		return domain.MatchingType_Full
+	}
+	panic("impossible")
 }

common/matcher/geosite/geosite.pb.go

@@ -6,11 +6,19 @@ option go_package = "github.com/xtls/xray-core/common/matcher/geosite";
 option java_package = "com.xray.common.matcher.geosite";
 option java_multiple_files = true;
 
-import "common/matcher/domain/domain.proto";
-
 message Domain {
+  enum Type {
+    // The value is used as is.
+    Plain = 0;
+    // The value is used as a regular expression.
+    Regex = 1;
+    // The value is a root domain.
+    Domain = 2;
+    // The value is a domain.
+    Full = 3;
+  }
   // Domain matching type.
-  xray.common.matcher.domain.MatchingType type = 1;
+  Type type = 1;
 
   // Domain value.
   string value = 2;