From 1f7988b3beab555fb9272e09b0eeeee9b2f95c0b Mon Sep 17 00:00:00 2001 From: Shawn <45581750+KOP-XIAO@users.noreply.github.com> Date: Sat, 9 May 2020 12:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96rule=E8=BD=AC=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/resource-parser.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js index 5dd1b8d..a1b0223 100644 --- a/Scripts/resource-parser.js +++ b/Scripts/resource-parser.js @@ -1,5 +1,5 @@ /** -# Quantumult X 资源解析器 (2020-05-09: 11:59) +# Quantumult X 资源解析器 (2020-05-09: 13:59) 本资源解析器作者: Shawn(请勿私聊问怎么用),有bug请反馈: @Shawn_KOP_bot 更新请关注tg频道: https://t.me/QuanX_API @@ -125,7 +125,7 @@ if(flag==3){ //判断订阅类型 function Type_Check(subs){ var type="" - var RuleK=["host","domain","ip-cidr","geoip","user-agent"]; + var RuleK=["host","domain","ip-cidr","geoip","user-agent","ip6-cidr"]; var QuanXK=["tag=","shadowsocks=","trojan=","vmess=","http="] var SurgeK=["=ss","=vmess","=trojan","=http"] const RuleCheck = (item) => subs.toLowerCase().indexOf(item)!=-1; @@ -231,7 +231,10 @@ function Rule_Handle(subs,Pout){ function Rule_Policy(content){ //增加、替换 policy var cnt=content.split(","); var RuleK=["//","#",";"]; - const RuleCheck = (item) => cnt[0].indexOf(item)!=-1; //无视注释行 + var RuleK1=["host","domain","ip-cidr","geoip","user-agent","ip6-cidr"]; + const RuleCheck = (item) => cnt[0].toLowerCase().indexOf(item)!=-1; //无视注释行 + const RuleCheck1 = (item) => cnt[0].toLowerCase().indexOf(item)!=-1; //无视 quanx 不支持的规则类别 + if(RuleK1.some(RuleCheck1)){ if(cnt.length==3 && cnt.indexOf("no-resolve")==-1){ ply0 = Ppolicy!="Shawn"? Ppolicy:cnt[2] nn=cnt[0]+", "+cnt[1]+", "+ply0 @@ -251,8 +254,8 @@ function Rule_Policy(content){ //增加、替换 policy if(cnt[0].indexOf("URL-REGEX")!=-1 || cnt[0].indexOf("PROCESS")!=-1){ nn="" } else {nn=nn.replace("IP-CIDR6","ip6-cidr")} - return nn - + return nn + } else{return ""}//if RuleK1 check }