diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js index 598ad43..90f5b1d 100644 --- a/Scripts/resource-parser.js +++ b/Scripts/resource-parser.js @@ -1413,44 +1413,47 @@ function Rule_Policy(content) { //增加、替换 policy // 处理纯列表, 包含 clash-provider function rule_list_handle(cnt) { - var RuleK = ["//", "#", ";","[", "!","/"] + var RuleK = ["//", "#", ";", "[", "!", "/"] const RuleCheck = (item) => cnt.trim().indexOf(item) == 0; //无视注释行 const nocheck = (item) => /^\d+$/.test(item) //检查数字项 cnt = cnt.split("#")[0].trim() // 去除注释部分 - if(cnt.trim().indexOf(" ")==-1 && cnt.trim()!= "" && !RuleK.some(RuleCheck)){ - if(cnt.indexOf("::")!=-1 && cnt.indexOf("/")!=-1) { // ip-v6? + if (cnt.trim().indexOf(" ") == -1 && cnt.trim() != "" && !RuleK.some(RuleCheck)) { + if (cnt.indexOf("::") != -1 && cnt.indexOf("/") != -1) { // ip-v6? cnt = "ip6-cidr, " + cnt - cnt = Ppolicy == "Shawn" ? cnt+", Shawn" : cnt+", "+Ppolicy + cnt = Ppolicy == "Shawn" ? cnt + ", Shawn" : cnt + ", " + Ppolicy } else if (cnt.split("/").length == 2) {//ip-cidr cnt = "ip-cidr, " + cnt - cnt = Ppolicy == "Shawn" ? cnt+", Shawn" : cnt+", "+Ppolicy + cnt = Ppolicy == "Shawn" ? cnt + ", Shawn" : cnt + ", " + Ppolicy } else if (cnt.split(".").length == 4 && cnt.split(".").every(nocheck)) { // ip 类规则 - cnt = "ip-cidr, " + cnt+ "/32" - cnt = Ppolicy == "Shawn" ? cnt+", Shawn" : cnt+", "+Ppolicy - } else if (cnt.indexOf("payload:")==-1) { //host - suffix, not clash rule list + cnt = "ip-cidr, " + cnt + "/32" + cnt = Ppolicy == "Shawn" ? cnt + ", Shawn" : cnt + ", " + Ppolicy + } else if (cnt.indexOf("payload:") == -1) { //host - suffix, not clash rule list //$notify("xxx","xxxx",cnt) //cnt=cnt.replace(/'|"/g,"").trim()//replace(/'|"|\+\.|\*\.|\*\.\*/g,"") 2023-04-10 - if(!/^('|")/.test(cnt)) { // not clash-provider - if(!/\*|\+/.test(cnt[0])) { - cnt = cnt[0]=="." ? cnt.replace(".",""): cnt - cnt = "host-suffix, " + cnt + + if (!/^('|")/.test(cnt)) { // not clash-provider + if (!/\*|\+/.test(cnt[0])) { + cnt = cnt[0] == "." ? cnt.replace(".", "") : cnt + cnt = "host-suffix, " + cnt } else { - cnt = "host-wildcard, " + cnt - } - } else { // clash provider - cnt=cnt.replace(/'|"/g,"").trim() - if ( /^(\*\.|\.)/.test(cnt) || cnt.indexOf("*")!=-1) { - cnt = "host-wildcard, " + cnt - } else { - cnt = "host-suffix, " + cnt.replace(/\+\./,"") + cnt = "host-wildcard, " + cnt + } + } else { // clash provider + cnt = cnt.replace(/'|"/g, "").trim() + + if (/^\.|\*\./.test(cnt) || cnt.indexOf("*") != -1) { + //1.以.或*.开头 -> 匹配子域名,wildcard,*.domain + //2.直接替换开头,正则未匹配 -> 不以*.开头的字符串但包含*的情况(wildcard,a.*.domain...) + cnt = "host-wildcard, " + cnt.replace(/^\.|\*\./, "*.") + } else { + cnt = "host-suffix, " + cnt.replace(/^(\+\.)/, "")//如果以+.开头 = 匹配当前域名及其子域名,采用 suffix,domain。 + } } + cnt = Ppolicy == "Shawn" ? cnt + ", Shawn" : cnt + ", " + Ppolicy } - cnt = Ppolicy == "Shawn" ? cnt+", Shawn" : cnt+", "+Ppolicy - } - - } - return cnt } + return cnt +} // Domain-Set function Domain2Rule(content) { @@ -3709,4 +3712,4 @@ function OR(...args) { function NOT(array) { return array.map(c => !c); -} \ No newline at end of file +}