From a9d6138d365e54281e222c7b5648a2cc4cfbf00a Mon Sep 17 00:00:00 2001 From: Xi Xu Date: Wed, 23 Oct 2024 23:23:54 +0800 Subject: [PATCH] Update META.js --- META.js | 130 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/META.js b/META.js index 956151f..1ed7b31 100644 --- a/META.js +++ b/META.js @@ -371,11 +371,11 @@ function generateServiceRules(services) { const rules = [ "RULE-SET,applications,DIRECT", "RULE-SET,private,DIRECT", - "RULE-SET,reject,Advertising", - "RULE-SET,category-ads-all,Advertising", + "RULE-SET,ads,Advertising", "RULE-SET,win-spy,Advertising", // "RULE-SET,win-extra,Advertising", ...generateServiceRules(services), + "RULE-SET,google@cn,Google,", "RULE-SET,proxy,PROXY", "RULE-SET,\u0067\u0066\u0077,PROXY", "RULE-SET,tld-!cn,PROXY", @@ -412,26 +412,12 @@ function generateServiceRuleProviders(services, defaultConfig) { } const ruleProviders = { - direct: { + ads: { ...ruleProviderDefaults, format: "mrs", behavior: "domain", - url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/direct.mrs", - path: "./ruleset/project-meta/direct.mrs", - }, - proxy: { - ...ruleProviderDefaults, - format: "mrs", - behavior: "domain", - url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/proxy.mrs", - path: "./ruleset/project-meta/proxy.mrs", - }, - reject: { - ...ruleProviderDefaults, - format: "mrs", - behavior: "domain", - url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/reject.mrs", - path: "./ruleset/project-meta/reject.mrs", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/ads.mrs", + path: "./ruleset/project-meta/ads.mrs", }, applications: { ...ruleProviderDefaults, @@ -440,48 +426,69 @@ const ruleProviders = { url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/applications.yaml", path: "./ruleset/project-meta/applications.yaml", }, - private: { + cncidr: { + ...ruleProviderDefaults, + format: "mrs", + behavior: "ipcidr", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/cncidr.mrs", + path: "./ruleset/project-meta/cncidr.mrs", + }, + direct: { ...ruleProviderDefaults, format: "mrs", behavior: "domain", - 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", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/direct.mrs", + path: "./ruleset/project-meta/direct.mrs", }, "\u0067\u0066\u0077": { ...ruleProviderDefaults, format: "mrs", behavior: "domain", - 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", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/\u0067\u0066\u0077.mrs", + path: "/ruleset/project-meta/\u0067\u0066\u0077.mrs", + }, + "google@cn": { + ...ruleProviderDefaults, + format: "mrs", + behavior: "domain", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/google@cn.mrs", + path: "./ruleset/project-meta/google@cn.mrs", + }, + lancidr: { + ...ruleProviderDefaults, + format: "mrs", + behavior: "ipcidr", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/lancidr.mrs", + path: "./ruleset/project-meta/lancidr.mrs", + }, + private: { + ...ruleProviderDefaults, + format: "mrs", + behavior: "domain", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/private.mrs", + path: "./ruleset/project-meta/private.mrs", + }, + proxy: { + ...ruleProviderDefaults, + format: "mrs", + behavior: "domain", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/proxy.mrs", + path: "./ruleset/project-meta/proxy.mrs", + }, + telegramcidr: { + ...ruleProviderDefaults, + format: "mrs", + behavior: "ipcidr", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/telegramcidr.mrs", + path: "./ruleset/project-meta/telegramcidr.mrs", }, "tld-!cn": { ...ruleProviderDefaults, format: "mrs", behavior: "domain", - 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", + url: "https://cdn.jsdelivr.net/gh/Project-META/rules-mrs@release/tld-!cn.mrs", + path: "./ruleset/project-meta/tld-!cn.mrs", }, - "category-ads-all": { - ...ruleProviderDefaults, - format: "mrs", - behavior: "domain", - 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/category-ads-all.mrs", - path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/category-ads-all.mrs", - }, - "win-spy": { - ...ruleProviderDefaults, - format: "mrs", - behavior: "domain", - 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/win-spy.mrs", - path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/win-spy.mrs", - }, - // "win-extra": { - // ...ruleProviderDefaults, - // format: "mrs", - // behavior: "domain", - // 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/win-extra.mrs", - // path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/win-extra.mrs", - // }, cn: { ...ruleProviderDefaults, format: "mrs", @@ -503,20 +510,20 @@ 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/geolocation-!cn.mrs", path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/geolocation-!cn.mrs", }, - lancidr: { + "win-spy": { ...ruleProviderDefaults, 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/private.mrs", - path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/lancidr.mrs", - }, - cncidr: { - ...ruleProviderDefaults, - 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/cncidr.mrs", + behavior: "domain", + 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/win-spy.mrs", + path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/win-spy.mrs", }, + // "win-extra": { + // ...ruleProviderDefaults, + // format: "mrs", + // behavior: "domain", + // 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/win-extra.mrs", + // path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/win-extra.mrs", + // }, googlecidr: { ...ruleProviderDefaults, format: "mrs", @@ -538,13 +545,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/geoip/twitter.mrs", path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/xcidr.mrs", }, - telegramcidr: { - ...ruleProviderDefaults, - 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/telegram.mrs", - path: "./ruleset/\u006D\u0065\u0074\u0061\u0063\u0075\u0062\u0065\u0078/telegramcidr.mrs", - }, ...generateServiceRuleProviders(services, ruleProviderDefaults), };