diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js index 02148fc..3fc47ee 100644 --- a/Scripts/resource-parser.js +++ b/Scripts/resource-parser.js @@ -1,5 +1,5 @@ /** -☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2022-05-31 22:20⟧ +☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2022-06-01 10:10⟧ ---------------------------------------------------------- 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_Parser_Bot ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API @@ -391,7 +391,7 @@ function ResourceParse() { //$notify("before","haha",total) total = TagCheck_QX(total).join("\n") //节点名检查 if (PUOT==1) { total = total.split("\n").map(UOT).join("\n")} - if (Pcnt == 1) {$notify("解析后最终返回内容" , "节点数量: " +total.split("\n").length, total)} + if (Pcnt == 1) {$notify("⟦" + subtag + "⟧"+"解析后最终返回内容" , "节点数量: " +total.split("\n").length, total)} total = PRelay==""? Base64.encode(total) : ServerRelay(total.split("\n"),PRelay) //强制节点类型 base64 加密后再导入 Quantumult X, 如果是relay,则转换成分流类型 if(Pflow==1) { //$notify("添加流量信息","xxx","xxxx") @@ -468,7 +468,6 @@ function RegCheck(total, typen, paraname,regpara) { } //判断订阅类型 function Type_Check(subs) { - var type = "unknown" var RuleK = ["host,", "-suffix,", "domain,", "-keyword,", "ip-cidr,", "ip-cidr6,", "geoip,", "user-agent,", "ip6-cidr,"]; var DomainK = ["domain-set,"] @@ -484,7 +483,7 @@ function Type_Check(subs) { const RuleCheck = (item) => subi.toLowerCase().indexOf(item) != -1; const NodeCheck = (item) => subi.toLowerCase().indexOf(item.toLowerCase()) != -1; const NodeCheck1 = (item) => subi.toLowerCase().indexOf(item.toLowerCase()) != -1; //b64加密的订阅类型 - const NodeCheck2 = (item) => subi.toLowerCase().indexOf(item.toLowerCase()) == 0; //URI 类型 + const NodeCheck2 = (item) => subi.toLowerCase().indexOf(item.toLowerCase()) != -1; //URI 类型 const RewriteCheck = (item) => subs.indexOf(item) != -1; var subsn = subs.split("\n") if ( (subs.indexOf(html) != -1 || subs.indexOf("doctype html") != -1) && link0.indexOf("github.com" == -1)) { @@ -539,7 +538,7 @@ function Type_Check(subs) { type = (typeQ == "unsupported" || typeQ =="server")? "Subs-B64Encode":"wrong-field" } // 用于通知判断类型,debug - if(type == "X"){ + if(typeU == "X"){ $notify("该链接判定类型",type+" : " +typec, subs) } //$notify(type)