From 6e792b44aa5726ed168dee88f505e6bb528bf7ef Mon Sep 17 00:00:00 2001 From: Shawn <45581750+KOP-XIAO@users.noreply.github.com> Date: Sun, 25 Jul 2021 16:39:32 +0800 Subject: [PATCH] minor bug fixed --- Scripts/resource-parser.js | 138 +++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 67 deletions(-) diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js index fda8103..1ded689 100644 --- a/Scripts/resource-parser.js +++ b/Scripts/resource-parser.js @@ -1,5 +1,5 @@ /** -☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2021-07-20 11:05⟧ +☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2021-07-25 17:05⟧ ---------------------------------------------------------- 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API @@ -673,74 +673,78 @@ function SCP2QX(subs) { var rw = "" subs = subs.split("\n").map(x => x.trim().replace(/\s+/g," ")) for (var i = 0; i < subs.length; i++) { - if (subs[i].slice(0, 8) == "hostname") { - hn = subs[i].replace(/\%.*\%/g, "") - nrw.push(hn) - } - var SC = ["type=", ".js", "pattern=", "script-path="] - var NoteK = ["//", "#", ";"]; //排除注释项 - const sccheck = (item) => subs[i].indexOf(item) != -1 - const notecheck = (item) => subs[i].indexOf(item) == 0 - if (!NoteK.some(notecheck)){ - if (SC.every(sccheck)) { // surge js 新格式 - ptn = subs[i].replace(/\s/gi,"").split("pattern=")[1].split(",")[0] - js = subs[i].replace(/\s/gi,"").split("script-path=")[1].split(",")[0] - type = subs[i].replace(/\s/gi,"").split("type=")[1].split(",")[0].trim() - subsi = subs[i].replace(/ /g,"").replace(/\=true/g,"=1") - if (type == "http-response" && subsi.indexOf("requires-body=1") != -1) { - type = "script-response-body " - } else if (type == "http-response" && subsi.indexOf("requires-body=1") == -1) { - type = "script-response-header " - } else if (type == "http-request" && subsi.indexOf("requires-body=1") != -1) { - type = "script-request-body " - } else if (type == "http-request" && subsi.indexOf("requires-body=1") == -1) { - type = "script-request-header " - } else {type = "" } - if (type != "") { - rw = ptn + " url " + type + js - nrw.push(rw) - } - } else if (subs[i].indexOf(" 302") != -1 || subs[i].indexOf(" 307") != -1) { //rewrite 302&307 复写 - //tpe = subs[i].indexOf(" 302") != -1? "302":"307" - rw = subs[i].split(" ")[0] + " url " + subs[i].split(" ")[2] + " " + subs[i].split(" ")[1].trim() - //if(rw.indexOf("307")!=-1) {$notify("XX",subs[i],rw.split(" "))} - nrw.push(rw) - } else if(subs[i].split(" ")[2] == "header") { // rewrite header 类型 - var pget = subs[i].split(" ")[0].split(".com")[1] - var pgetn = subs[i].split(" ")[1].split(".com")[1] - rw = subs[i].split(" ")[0] + " url request-header ^GET " + pget +"(.+\\r\\n)Host:.+(\\r\\n) request-header GET " + pgetn + "$1Host: " + subs[i].split(" ")[1].split("://")[1].split(".com")[0] + ".com$2" - nrw.push(rw) - } else if(subs[i].split(" ")[1] == "header-replace") { // rewrite header-replace 类型 - console.log(subs[i]) - var pget = subs[i].split("header-replace")[1].split(":")[0].trim() - var pgetn = subs[i].split("header-replace")[1].trim() - rw = subs[i].split(" ")[0] + " url request-header " +"(.+\\r\\n)"+pget+":.+(\\r\\n) request-header " + "$1" + pgetn + "$2" - nrw.push(rw) - } else if(subs[i].indexOf(" - reject") != -1) { // rewrite reject 类型 - rw = subs[i].split(" ")[0] + " url reject-200" - nrw.push(rw) - } else if (subs[i].indexOf("script-path") != -1) { //surge js 旧写法 - type = subs[i].replace(/\s+/g," ").split(" ")[0] - js = subs[i].split("script-path")[1].split("=")[1].split(",")[0] - ptn = subs[i].replace(/\s+/g," ").split(" ")[1] - subsi = subs[i].replace(/ /g,"").replace(/\=true/g,"=1") - if (type == "http-response" && subsi.indexOf("requires-body=1") != -1) { - type = "script-response-body " - } else if (type == "http-response" && subsi.indexOf("requires-body=1") == -1) { - type = "script-response-header " - } else if (type == "http-request" && subsi.indexOf("requires-body=1") != -1) { - type = "script-request-body " - } else if (type == "http-request" && subsi.indexOf("requires-body=1") == -1) { - type = "script-request-header " - } else {type = "" } - if (type != "") { - rw = ptn + " url " + type + js - nrw.push(rw) - } - + try { + if (subs[i].slice(0, 8) == "hostname") { + hn = subs[i].replace(/\%.*\%/g, "") + nrw.push(hn) } + var SC = ["type=", ".js", "pattern=", "script-path="] + var NoteK = ["//", "#", ";"]; //排除注释项 + const sccheck = (item) => subs[i].indexOf(item) != -1 + const notecheck = (item) => subs[i].indexOf(item) == 0 + if (!NoteK.some(notecheck)){ + if (SC.every(sccheck)) { // surge js 新格式 + ptn = subs[i].replace(/\s/gi,"").split("pattern=")[1].split(",")[0] + js = subs[i].replace(/\s/gi,"").split("script-path=")[1].split(",")[0] + type = subs[i].replace(/\s/gi,"").split("type=")[1].split(",")[0].trim() + subsi = subs[i].replace(/ /g,"").replace(/\=true/g,"=1") + if (type == "http-response" && subsi.indexOf("requires-body=1") != -1) { + type = "script-response-body " + } else if (type == "http-response" && subsi.indexOf("requires-body=1") == -1) { + type = "script-response-header " + } else if (type == "http-request" && subsi.indexOf("requires-body=1") != -1) { + type = "script-request-body " + } else if (type == "http-request" && subsi.indexOf("requires-body=1") == -1) { + type = "script-request-header " + } else {type = "" } + if (type != "") { + rw = ptn + " url " + type + js + nrw.push(rw) + } + } else if (subs[i].indexOf(" 302") != -1 || subs[i].indexOf(" 307") != -1) { //rewrite 302&307 复写 + //tpe = subs[i].indexOf(" 302") != -1? "302":"307" + rw = subs[i].split(" ")[0] + " url " + subs[i].split(" ")[2] + " " + subs[i].split(" ")[1].trim() + //if(rw.indexOf("307")!=-1) {$notify("XX",subs[i],rw.split(" "))} + nrw.push(rw) + } else if(subs[i].split(" ")[2] == "header") { // rewrite header 类型 + var pget = subs[i].split(" ")[0].split(".com")[1] + var pgetn = subs[i].split(" ")[1].split(".com")[1] + rw = subs[i].split(" ")[0] + " url 302 " + subs[i].split(" ")[1] + //rw = subs[i].split(" ")[0] + " url request-header ^GET " + pget +"(.+\\r\\n)Host:.+(\\r\\n) request-header GET " + pgetn + "$1Host: " + subs[i].split(" ")[1].split("://")[1].split(".com")[0] + ".com$2" + nrw.push(rw) + } else if(subs[i].split(" ")[1] == "header-replace") { // rewrite header-replace 类型 + console.log(subs[i]) + var pget = subs[i].split("header-replace")[1].split(":")[0].trim() + var pgetn = subs[i].split("header-replace")[1].trim() + rw = subs[i].split(" ")[0] + " url request-header " +"(.+\\r\\n)"+pget+":.+(\\r\\n) request-header " + "$1" + pgetn + "$2" + nrw.push(rw) + } else if(subs[i].indexOf(" - reject") != -1) { // rewrite reject 类型 + rw = subs[i].split(" ")[0] + " url reject-200" + nrw.push(rw) + } else if (subs[i].indexOf("script-path") != -1) { //surge js 旧写法 + type = subs[i].replace(/\s+/g," ").split(" ")[0] + js = subs[i].split("script-path")[1].split("=")[1].split(",")[0] + ptn = subs[i].replace(/\s+/g," ").split(" ")[1] + subsi = subs[i].replace(/ /g,"").replace(/\=true/g,"=1") + if (type == "http-response" && subsi.indexOf("requires-body=1") != -1) { + type = "script-response-body " + } else if (type == "http-response" && subsi.indexOf("requires-body=1") == -1) { + type = "script-response-header " + } else if (type == "http-request" && subsi.indexOf("requires-body=1") != -1) { + type = "script-request-body " + } else if (type == "http-request" && subsi.indexOf("requires-body=1") == -1) { + type = "script-request-header " + } else {type = "" } + if (type != "") { + rw = ptn + " url " + type + js + nrw.push(rw) + } + + } + } + } catch (err) { + $notify("❌️解析此条时出现错误，已忽略",subs[i],err) } - } return nrw }