Add apple-update rule for apple clients

SagerNet · Dec 30, 2023 · 2a3dabd · 2a3dabd
1 parent 22d9c49
commit 2a3dabd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/option/template.go b/option/template.go
@@ -1,9 +1,11 @@
 package option
 
 import (
+	M "github.com/sagernet/serenity/common/metadata"
 	"github.com/sagernet/serenity/common/semver"
 	"github.com/sagernet/sing-box/option"
-	dns "github.com/sagernet/sing-dns"
+	"github.com/sagernet/sing-dns"
+	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/json/badjson"
 )
 
@@ -67,6 +69,20 @@ func (t Template) DisableIPv6() bool {
 	return t.DomainStrategy == option.DomainStrategy(dns.DomainStrategyUseIPv4)
 }
 
+func (t Template) ChinaGeositeList(metadata M.Metadata) []string {
+	chinaCodes := []string{"cn", "category-companies@cn"}
+	if metadata.Platform.IsApple() {
+		chinaCodes = append(chinaCodes, "apple-update")
+	}
+	return chinaCodes
+}
+
+func (t Template) ChinaGeositeRuleSetList(metadata M.Metadata) []string {
+	return common.Map(t.ChinaGeositeList(metadata), func(it string) string {
+		return "geosite-" + it
+	})
+}
+
 type ExtraGroup struct {
 	Tag            string                          `json:"tag,omitempty"`
 	Type           string                          `json:"type,omitempty"`

diff --git a/template/render_dns.go b/template/render_dns.go
@@ -128,10 +128,7 @@ func (t *Template) renderDNS(metadata M.Metadata, options *option.Options) error
 							{
 								Type: C.RuleTypeDefault,
 								DefaultOptions: option.DefaultDNSRule{
-									Geosite: []string{
-										"cn",
-										"category-companies@cn",
-									},
+									Geosite: t.ChinaGeositeList(metadata),
 								},
 							},
 						},
@@ -154,10 +151,7 @@ func (t *Template) renderDNS(metadata M.Metadata, options *option.Options) error
 							{
 								Type: C.RuleTypeDefault,
 								DefaultOptions: option.DefaultDNSRule{
-									RuleSet: []string{
-										"geosite-cn",
-										"geosite-category-companies@cn",
-									},
+									RuleSet:      t.ChinaGeositeRuleSetList(metadata),
 									DomainSuffix: []string{"download.jetbrains.com"},
 								},
 							},

diff --git a/template/render_geo_resources.go b/template/render_geo_resources.go
@@ -56,7 +56,6 @@ func (t *Template) renderGeoResources(metadata M.Metadata, options *option.Optio
 			downloadURL = "https://raw.githubusercontent.com/"
 			branchSplit = "/"
 		}
-
 		options.Route.RuleSet = []option.RuleSet{
 			{
 				Type:   C.RuleSetTypeRemote,
@@ -95,5 +94,16 @@ func (t *Template) renderGeoResources(metadata M.Metadata, options *option.Optio
 				},
 			},
 		}
+		if metadata.Platform.IsApple() {
+			options.Route.RuleSet = append(options.Route.RuleSet, option.RuleSet{
+				Type:   C.RuleSetTypeRemote,
+				Tag:    "geosite-apple-update",
+				Format: C.RuleSetFormatBinary,
+				RemoteOptions: option.RemoteRuleSet{
+					URL:            downloadURL + "SagerNet/sing-geosite" + branchSplit + "rule-set/geosite-apple-update.srs",
+					DownloadDetour: downloadDetour,
+				},
+			})
+		}
 	}
 }
diff --git a/template/render_route.go b/template/render_route.go
@@ -136,7 +136,7 @@ func (t *Template) renderRoute(metadata M.Metadata, options *option.Options) err
 								Type: C.RuleTypeDefault,
 								DefaultOptions: option.DefaultRule{
 									GeoIP:   []string{"cn"},
-									Geosite: []string{"cn", "category-companies@cn"},
+									Geosite: t.ChinaGeositeList(metadata),
 									Domain:  []string{"download.jetbrains.com"},
 								},
 							},
@@ -160,7 +160,7 @@ func (t *Template) renderRoute(metadata M.Metadata, options *option.Options) err
 							{
 								Type: C.RuleTypeDefault,
 								DefaultOptions: option.DefaultRule{
-									RuleSet: []string{"geoip-cn", "geosite-cn", "geosite-category-companies@cn"},
+									RuleSet: append([]string{"geoip-cn"}, t.ChinaGeositeRuleSetList(metadata)...),
 									Domain:  []string{"download.jetbrains.com"},
 								},
 							},