Minor fixes

SagerNet · Sep 11, 2024 · 877108a · 877108a
1 parent adab7ec
commit 877108a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/...ate/filter/filter_null_group_reference.go → template/filter/filter_null_references.go b/...ate/filter/filter_null_group_reference.go → template/filter/filter_null_references.go
@@ -30,5 +30,15 @@ func filterNullGroupReference(metadata M.Metadata, options *option.Options) erro
 		}
 		options.Outbounds[i] = outbound
 	}
+	options.Route.Rules = common.Filter(options.Route.Rules, func(it option.Rule) bool {
+		switch it.Type {
+		case C.RuleTypeDefault:
+			return common.Contains(outboundTags, it.DefaultOptions.Outbound)
+		case C.RuleTypeLogical:
+			return common.Contains(outboundTags, it.LogicalOptions.Outbound)
+		default:
+			panic("no")
+		}
+	})
 	return nil
 }
diff --git a/template/manager.go b/template/manager.go
@@ -41,7 +41,7 @@ func extendTemplate(rawTemplates []option.Template, root, current option.Templat
 		}
 		next = newNext
 	}
-	newRawTemplate, err := badjson.MergeJSON(next.RawMessage, current.RawMessage, true)
+	newRawTemplate, err := badjson.MergeJSON(next.RawMessage, current.RawMessage, false)
 	if err != nil {
 		return option.Template{}, E.Cause(err, "initialize template[", current.Name, "]: merge extended template: ", current.Extend)
 	}

diff --git a/template/render_dns.go b/template/render_dns.go
@@ -162,7 +162,7 @@ func (t *Template) renderDNS(metadata M.Metadata, options *option.Options) error
 					},
 				})
 			}
-			if !t.DisableDNSLeak && (metadata.Version != nil && metadata.Version.GreaterThanOrEqual(semver.ParseVersion("1.9.0-alpha.1"))) {
+			if !t.DisableDNSLeak && (metadata.Version == nil || metadata.Version.LessThan(semver.ParseVersion("1.9.0-alpha.1"))) {
 				options.DNS.Rules = append(options.DNS.Rules, option.DNSRule{
 					Type: C.RuleTypeDefault,
 					DefaultOptions: option.DefaultDNSRule{

diff --git a/template/render_experimental.go b/template/render_experimental.go
@@ -30,7 +30,7 @@ func (t *Template) renderExperimental(metadata M.Metadata, options *option.Optio
 				CacheID:     profileName,
 				StoreFakeIP: t.EnableFakeIP,
 			}
-			if !t.DisableDNSLeak && (metadata.Version != nil && metadata.Version.GreaterThanOrEqual(semver.ParseVersion("1.9.0-alpha.8"))) {
+			if !t.DisableDNSLeak && (metadata.Version == nil || metadata.Version.LessThan(semver.ParseVersion("1.9.0-alpha.1"))) {
 				options.Experimental.CacheFile.StoreRDRC = true
 			}
 		}
@@ -51,7 +51,7 @@ func (t *Template) renderExperimental(metadata M.Metadata, options *option.Optio
 	}
 
 	if !t.DisableClashMode {
-		if !t.DisableDNSLeak && (metadata.Version != nil && metadata.Version.GreaterThanOrEqual(semver.ParseVersion("1.9.0-alpha.1"))) {
+		if !t.DisableDNSLeak && (metadata.Version == nil || metadata.Version.LessThan(semver.ParseVersion("1.9.0-alpha.1"))) {
 			clashModeLeak := t.ClashModeLeak
 			if clashModeLeak == "" {
 				clashModeLeak = "Leak"