starsswp/QuantumultX
1
0
Fork 0
mirror of https://github.com/KOP-XIAO/QuantumultX.git synced 2026-01-25 17:15:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from 1nC0deWeTrust/master

Browse Source 
Update resource-parser.js
This commit is contained in:
Shawn
2023-04-13 09:24:01 +08:00
committed by GitHub
parent 3cf87856f9 e1cef1e321
commit 0ce1642332
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Scripts/resource-parser.js
View File

@@ -1413,44 +1413,47 @@ function Rule_Policy(content) { //增加、替换 policy
// 处理纯列表, 包含 clash-provider // 处理纯列表, 包含 clash-provider
function rule_list_handle(cnt) { function rule_list_handle(cnt) {
var RuleK = ["//", "#", ";","[", "!","/"] var RuleK = ["//", "#", ";", "[", "!", "/"]
const RuleCheck = (item) => cnt.trim().indexOf(item) == 0; //无视注释行 const RuleCheck = (item) => cnt.trim().indexOf(item) == 0; //无视注释行
const nocheck = (item) => /^\d+$/.test(item) //检查数字项 const nocheck = (item) => /^\d+$/.test(item) //检查数字项
cnt = cnt.split("#")[0].trim() // 去除注释部分 cnt = cnt.split("#")[0].trim() // 去除注释部分
if(cnt.trim().indexOf(" ")==-1 && cnt.trim()!= "" && !RuleK.some(RuleCheck)){ if (cnt.trim().indexOf(" ") == -1 && cnt.trim() != "" && !RuleK.some(RuleCheck)) {
if(cnt.indexOf("::")!=-1 && cnt.indexOf("/")!=-1) { // ip-v6? if (cnt.indexOf("::") != -1 && cnt.indexOf("/") != -1) { // ip-v6?
cnt = "ip6-cidr, " + cnt 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 } else if (cnt.split("/").length == 2) {//ip-cidr
cnt = "ip-cidr, " + cnt 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 类规则 } else if (cnt.split(".").length == 4 && cnt.split(".").every(nocheck)) { // ip 类规则
cnt = "ip-cidr, " + cnt+ "/32" cnt = "ip-cidr, " + cnt + "/32"
cnt = Ppolicy == "Shawn" ? cnt+", Shawn" : cnt+", "+Ppolicy cnt = Ppolicy == "Shawn" ? cnt + ", Shawn" : cnt + ", " + Ppolicy
} else if (cnt.indexOf("payload:")==-1) { //host - suffix, not clash rule list } else if (cnt.indexOf("payload:") == -1) { //host - suffix, not clash rule list
//$notify("xxx","xxxx",cnt) //$notify("xxx","xxxx",cnt)
//cnt=cnt.replace(/'|"/g,"").trim()//replace(/'|"|\+\.|\*\.|\*\.\*/g,"") 2023-04-10 //cnt=cnt.replace(/'|"/g,"").trim()//replace(/'|"|\+\.|\*\.|\*\.\*/g,"") 2023-04-10
if(!/^('|")/.test(cnt)) { // not clash-provider
if(!/\*|\+/.test(cnt[0])) { if (!/^('|")/.test(cnt)) { // not clash-provider
cnt = cnt[0]=="." ? cnt.replace(".",""): cnt if (!/\*|\+/.test(cnt[0])) {
cnt = "host-suffix, " + cnt cnt = cnt[0] == "." ? cnt.replace(".", "") : cnt
cnt = "host-suffix, " + cnt
} else { } else {
cnt = "host-wildcard, " + cnt cnt = "host-wildcard, " + cnt
} }
} else { // clash provider } else { // clash provider
cnt=cnt.replace(/'|"/g,"").trim() cnt = cnt.replace(/'|"/g, "").trim()
if ( /^(\*\.|\.)/.test(cnt) || cnt.indexOf("*")!=-1) {
cnt = "host-wildcard, " + cnt if (/^\.|\*\./.test(cnt) || cnt.indexOf("*") != -1) {
} else { //1.以.或*.开头 -> 匹配子域名，wildcard,*.domain
cnt = "host-suffix, " + cnt.replace(/\+\./,"") //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 // Domain-Set
function Domain2Rule(content) { function Domain2Rule(content) {
@@ -3709,4 +3712,4 @@ function OR(...args) {
function NOT(array) { function NOT(array) {
return array.map(c => !c); return array.map(c => !c);
} }