Update META.js

xixu-me · Oct 22, 2024 · b38825b · b38825b
1 parent 8b543e1
commit b38825b
Showing 1 changed file with 20 additions and 44 deletions.
diff --git a/META.js b/META.js
@@ -392,18 +392,15 @@ const rules = [
     "RULE-SET,win-spy,Advertising",
     "RULE-SET,win-extra,Advertising",
     "RULE-SET,icloud,iCloud",
-    "RULE-SET,apple@cn,Apple",
     "RULE-SET,apple,Apple",
-    "RULE-SET,google@cn,Google",
     "RULE-SET,google,Google",
     "RULE-SET,proxy,PROXY",
     "RULE-SET,\u0067\u0066\u0077,PROXY",
-    "RULE-SET,tld-not-cn,PROXY",
+    "RULE-SET,tld-!cn,PROXY",
     "RULE-SET,direct,DIRECT",
     "RULE-SET,lancidr,DIRECT,no-resolve",
     "RULE-SET,cncidr,DIRECT,no-resolve",
     "RULE-SET,telegramcidr,Telegram,no-resolve",
-    "RULE-SET,geoip-cn,DIRECT,no-resolve",
     "MATCH,Others",
 ];
 
@@ -458,61 +455,47 @@ const ruleProviders = {
         url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geosite/private.mrs",
         path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/private.mrs",
     },
-    "apple@cn": {
-        ...ruleProviderCommon,
-        format: "yaml",
-        behavior: "domain",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/apple.txt",
-        path: "./ruleset/loyalsoldier/[email protected]",
-    },
     icloud: {
         ...ruleProviderCommon,
-        format: "yaml",
-        behavior: "domain",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/icloud.txt",
-        path: "./ruleset/loyalsoldier/icloud.yaml",
-    },
-    "google@cn": {
-        ...ruleProviderCommon,
-        format: "yaml",
+        format: "mrs",
         behavior: "domain",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/google.txt",
-        path: "./ruleset/loyalsoldier/[email protected]",
+        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geosite/icloud.mrs",
+        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/icloud.mrs",
     },
     "\u0067\u0066\u0077": {
         ...ruleProviderCommon,
-        format: "yaml",
+        format: "mrs",
         behavior: "domain",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/\u0067\u0066\u0077.txt",
-        path: "./ruleset/loyalsoldier/\u0067\u0066\u0077.yaml",
+        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geosite/\u0067\u0066\u0077.mrs",
+        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/\u0067\u0066\u0077.mrs",
     },
-    "tld-not-cn": {
+    "tld-!cn": {
         ...ruleProviderCommon,
-        format: "yaml",
+        format: "mrs",
         behavior: "domain",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/tld-not-cn.txt",
-        path: "./ruleset/loyalsoldier/tld-not-cn.yaml",
+        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geosite/tld-!cn.mrs",
+        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/tld-!cn.mrs",
     },
     telegramcidr: {
         ...ruleProviderCommon,
-        format: "yaml",
+        format: "mrs",
         behavior: "ipcidr",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/telegramcidr.txt",
-        path: "./ruleset/loyalsoldier/telegramcidr.yaml",
+        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geoip/telegram.mrs",
+        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/telegramcidr.mrs",
     },
     lancidr: {
         ...ruleProviderCommon,
-        format: "yaml",
+        format: "mrs",
         behavior: "ipcidr",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/lancidr.txt",
-        path: "./ruleset/loyalsoldier/lancidr.yaml",
+        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geoip/private.mrs",
+        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/lancidr.mrs",
     },
     cncidr: {
         ...ruleProviderCommon,
-        format: "yaml",
+        format: "mrs",
         behavior: "ipcidr",
-        url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/\u0063\u006c\u0061\u0073\u0068-rules@release/cncidr.txt",
-        path: "./ruleset/loyalsoldier/cncidr.yaml",
+        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geoip/cn.mrs",
+        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/cncidr.mrs",
     },
     applications: {
         ...ruleProviderCommon,
@@ -570,13 +553,6 @@ const ruleProviders = {
         url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geosite/google.mrs",
         path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/google.mrs",
     },
-    "geoip-cn": {
-        ...ruleProviderCommon,
-        format: "mrs",
-        behavior: "ipcidr",
-        url: "https://cdn.jsdelivr.net/gh/\u004D\u0065\u0074\u0061\u0043\u0075\u0062\u0065\u0058/\u006D\u0065\u0074\u0061-rules-dat@\u006D\u0065\u0074\u0061/geo/geoip/cn.mrs",
-        path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/geoip-cn.mrs",
-    },
     ...createServiceRuleProviders(services, ruleProviderCommon),
 };