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

bug fixed

Browse Source
This commit is contained in:
Shawn
2020-09-01 13:56:21 +08:00
parent 336f77b3fa
commit dfef665c8f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Scripts/resource-parser.js
View File

@@ -1,5 +1,5 @@
/** /**
☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2020-09-01 08:29⟧ ☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2020-09-01 13:59⟧
---------------------------------------------------------- ----------------------------------------------------------
🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot
⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -209,9 +209,9 @@ if (type0 == "Subs-B64Encode") {
flag = -1; flag = -1;
} else { flag = 0 } } else { flag = 0 }
if (Pcnt == 1) {$notify("final content" , "Nodes", total)}
if (flag == 1) { //server 类型统一处理 if (flag == 1) { //server 类型统一处理
total = total.filter(Boolean)
if (Pinfo == 1 && ntf_flow == 0) { //假节点类型的流量通知 if (Pinfo == 1 && ntf_flow == 0) { //假节点类型的流量通知
flowcheck(total) flowcheck(total)
} }
@@ -239,8 +239,9 @@ if (flag == 1) { //server 类型统一处理
if (Psort0) { if (Psort0) {
total = QXSort(total, Psort0); total = QXSort(total, Psort0);
} }
if (Pcnt == 1) {$notify("final content" , "Nodes", total)}
total = TagCheck_QX(total) //节点名检查 total = TagCheck_QX(total) //节点名检查
//if (Pcnt == 1) {$notify("final content" , "Nodes", total)} if (Pcnt == 1) {$notify("final content" , "Nodes", total)}
if (flag == 1) { total = Base64.encode(total.join("\n")) } //强制节点类型 base64 加密后再导入 Quantumult X if (flag == 1) { total = Base64.encode(total.join("\n")) } //强制节点类型 base64 加密后再导入 Quantumult X
$done({ content: total }); $done({ content: total });
} else { $done({ content: total });} } else { $done({ content: total });}
@@ -298,11 +299,11 @@ function Type_Check(subs) {
type = "Clash"; type = "Clash";
//console.log(type) //console.log(type)
content0 = Clash2QX(subs) content0 = Clash2QX(subs)
} else if ( (subi.indexOf("[Script]") != -1 || subi.indexOf("[Rule]") != -1 || subs.indexOf("[URL Rewrite]") != -1 || subs.indexOf("[Map Local]") != -1 || subs.indexOf("[MITM]") != -1 || para1.indexOf("dst=rewrite") != -1) && (para1.indexOf("dst=filter") == -1) ) { // Surge 类型 module /rule-set(含url-regex) 类型 } else if ( (subi.indexOf("[Script]") != -1 || subi.indexOf("[Rule]") != -1 || subs.indexOf("[URL Rewrite]") != -1 || subs.indexOf("[Map Local]") != -1 || subs.indexOf("[MITM]") != -1 || para1.indexOf("dst=rewrite") != -1) && (para1.indexOf("dst=filter") == -1) && subs.indexOf("[Proxy]") == -1) { // Surge 类型 module /rule-set(含url-regex) 类型
type = "sgmodule" type = "sgmodule"
} else if (subi.indexOf("hostname=") != -1 || RewriteK.some(RewriteCheck)) { } else if (subi.indexOf("hostname=") != -1 || RewriteK.some(RewriteCheck)) {
type = "rewrite" //Quantumult X 类型 rewrite type = "rewrite" //Quantumult X 类型 rewrite
} else if (RuleK.some(RuleCheck) && subs.indexOf(html) == -1) { } else if (RuleK.some(RuleCheck) && subs.indexOf(html) == -1 && subs.indexOf("[Proxy]") == -1) {
type = "Rule"; type = "Rule";
} else if (DomainK.some(RuleCheck)) { } else if (DomainK.some(RuleCheck)) {
type = "Rule"; type = "Rule";
@@ -976,6 +977,7 @@ function Filter(servers, Pin, Pout) {
var Nlist = []; var Nlist = [];
var Delist = []; var Delist = [];
var Nname = []; var Nname = [];
servers = servers.filter(Boolean)
for (var i = 0; i < servers.length; i++) { for (var i = 0; i < servers.length; i++) {
if (Scheck(servers[i], Pin) != 0 && Scheck(servers[i], Pout) != 1) { if (Scheck(servers[i], Pin) != 0 && Scheck(servers[i], Pout) != 1) {
Nlist.push(servers[i]) Nlist.push(servers[i])