bug fixed

This commit is contained in:
Shawn
2021-01-04 16:21:07 +08:00
parent 14ae16d41e
commit 91543d6ecf
2 changed files with 8 additions and 5 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -1,5 +1,5 @@
/** /**
☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2021-01-03 14:59⟧ ☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2021-01-04 16:59⟧
---------------------------------------------------------- ----------------------------------------------------------
🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot
⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -443,7 +443,7 @@ function type_suffix(item) {
} }
function getnode_type(item,ind) { function getnode_type(item,ind) {
if(item.trim()!="") { if(item.trim()!="" && item.indexOf("tag=")!=-1) {
ind = !/^(0|1|2|3)$/.test(ind) ? 4 : ind ind = !/^(0|1|2|3)$/.test(ind) ? 4 : ind
typefix = {"shadowsocks":["𝐬𝐬","𝐒𝐒","🅢🅢","🆂🆂","SS"],"shadowsocksr":["𝐬𝐬𝐫","𝐒𝐒𝐑","🅢🅢🅡","🆂🆂🆁","SSR"],"vmess":["𝐯𝐦𝐞𝐬𝐬","𝐕𝐌𝐄𝐒𝐒","🅥🅜🅔🅢🅢","🆅🅼🅴🆂🆂","VMESS"],"trojan":["𝐭𝐫𝐨𝐣𝐚𝐧","𝐓𝐑𝐎𝐉𝐀𝐍","🅣🅡🅞🅙🅐🅝","🆃🆁🅾🅹🅰🅽","TROJAN"],"http":["𝐡𝐭𝐭𝐩","𝐇𝐓𝐓𝐏","🅗🅣🅣🅟","🅷🆃🆃🅿","HTTP"]} typefix = {"shadowsocks":["𝐬𝐬","𝐒𝐒","🅢🅢","🆂🆂","SS"],"shadowsocksr":["𝐬𝐬𝐫","𝐒𝐒𝐑","🅢🅢🅡","🆂🆂🆁","SSR"],"vmess":["𝐯𝐦𝐞𝐬𝐬","𝐕𝐌𝐄𝐒𝐒","🅥🅜🅔🅢🅢","🆅🅼🅴🆂🆂","VMESS"],"trojan":["𝐭𝐫𝐨𝐣𝐚𝐧","𝐓𝐑𝐎𝐉𝐀𝐍","🅣🅡🅞🅙🅐🅝","🆃🆁🅾🅹🅰🅽","TROJAN"],"http":["𝐡𝐭𝐭𝐩","𝐇𝐓𝐓𝐏","🅗🅣🅣🅟","🅷🆃🆃🅿","HTTP"]}
typefix["shadowsocks"]=item.indexOf("ssr-protocol")!=-1? typefix["shadowsocksr"] : typefix["shadowsocks"] typefix["shadowsocks"]=item.indexOf("ssr-protocol")!=-1? typefix["shadowsocksr"] : typefix["shadowsocks"]
@@ -1543,7 +1543,8 @@ function SVmess2QX(content) {
var puname = cnt.indexOf("username") != -1 ? "password=" + cnt.split("username")[1].split(",")[0].split("=")[1].trim() : ""; var puname = cnt.indexOf("username") != -1 ? "password=" + cnt.split("username")[1].split(",")[0].split("=")[1].trim() : "";
var pmtd = "method=aes-128-gcm"; var pmtd = "method=aes-128-gcm";
var ptls13 = paraCheck(cnt, "tls13") == "true" ? "tls13=true" : "tls13=false"; var ptls13 = paraCheck(cnt, "tls13") == "true" ? "tls13=true" : "tls13=false";
var pverify = paraCheck(cnt, "skip-cert-verify") == "true" ? "tls-verification=false" : "tls-verification=true"; var pverify = cnt.replace(/ /g,"").indexOf("skip-cert-verify=false") != -1 ? "tls-verification=true" : "tls-verification=false";
pvefify = Pcert0 == 1? "tls-verification=true" : pverify ;
if (paraCheck(cnt.replace(/tls13/, ""), "tls") == "true" && paraCheck(cnt.replace(/ws-header/, ""), "ws") == "true") { if (paraCheck(cnt.replace(/tls13/, ""), "tls") == "true" && paraCheck(cnt.replace(/ws-header/, ""), "ws") == "true") {
pobfs = "obfs=wss" + ", " + ptls13 + ", " + pverify pobfs = "obfs=wss" + ", " + ptls13 + ", " + pverify
} else if (paraCheck(cnt.replace(/ws-header/, ""), "ws") == "true") { } else if (paraCheck(cnt.replace(/ws-header/, ""), "ws") == "true") {
@@ -1592,7 +1593,8 @@ function Strojan2QX(content) {
var pwd = "password=" + cnt.split("password")[1].split(",")[0].split("=")[1].trim(); var pwd = "password=" + cnt.split("password")[1].split(",")[0].split("=")[1].trim();
var ptls = "over-tls=true"; var ptls = "over-tls=true";
var ptfo = paraCheck(cnt, "tfo") == "true" ? "fast-open=true" : "fast-open=false"; var ptfo = paraCheck(cnt, "tfo") == "true" ? "fast-open=true" : "fast-open=false";
var pverify = paraCheck(cnt, "skip-cert-verify") == "true" ? "tls-verification=false" : "tls-verification=true"; var pverify = cnt.replace(/ /g,"").indexOf("skip-cert-verify=false") != -1 ? "tls-verification=true" : "tls-verification=false";
pvefify = Pcert0 == 1? "tls-verification=true" : pverify ;
var ptls13 = paraCheck(cnt, "tls13") == "true" ? "tls13=true" : "tls13=false"; var ptls13 = paraCheck(cnt, "tls13") == "true" ? "tls13=true" : "tls13=false";
var nserver = "trojan= " + [ipport, pwd, ptls, ptfo, ptls13, pverify, tag].join(", "); var nserver = "trojan= " + [ipport, pwd, ptls, ptfo, ptls13, pverify, tag].join(", ");
return nserver return nserver
@@ -1607,7 +1609,8 @@ function Shttp2QX(content) {
var ptls = cnt.split("=")[1].split(",")[0].trim() == "https" ? "over-tls=true" : "over-tls=false"; var ptls = cnt.split("=")[1].split(",")[0].trim() == "https" ? "over-tls=true" : "over-tls=false";
var ptfo = paraCheck(cnt, "tfo") == "true" ? "fast-open=true" : "fast-open=false"; var ptfo = paraCheck(cnt, "tfo") == "true" ? "fast-open=true" : "fast-open=false";
if (ptls == "over-tls=true") { if (ptls == "over-tls=true") {
var pverify = paraCheck(cnt, "skip-cert-verify") == "true" ? "tls-verification=false" : "tls-verification=true"; var pverify = cnt.replace(/ /g,"").indexOf("skip-cert-verify=false") != -1 ? "tls-verification=true" : "tls-verification=false";
pvefify = Pcert0 == 1? "tls-verification=true" : pverify ;
var ptls13 = paraCheck(cnt, "tls13") == "true" ? "tls13=true" : "tls13=false"; var ptls13 = paraCheck(cnt, "tls13") == "true" ? "tls13=true" : "tls13=false";
ptls = ptls + ", " + pverify + ", " + ptls13 ptls = ptls + ", " + pverify + ", " + ptls13
} }