mirror of
https://github.com/KOP-XIAO/QuantumultX.git
synced 2026-01-25 17:15:09 +00:00
minor bug fixed
This commit is contained in:
Shawn
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2022-01-04 23:15⟧
|
||||
☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2022-01-11 12:45⟧
|
||||
----------------------------------------------------------
|
||||
🛠 发现 𝐁𝐔𝐆 请反馈: @ShawnKOP_bot
|
||||
⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
|
||||
@@ -14,7 +14,7 @@
|
||||
☑︎ 𝐒𝐮𝐫𝐠𝐞/𝐂𝐥𝐚𝐬𝐡 类型规则 𝗹𝗶𝘀𝘁 与 模块 𝐦𝐨𝐝𝐮𝐥𝐞 的解析使用
|
||||
----------------------------------------------------------
|
||||
0️⃣ 在 ⟦订阅链接⟧ 后加 "#" 使用, 不同参数用 "&" 连接
|
||||
⚠️ ☞ https://mysub.com#emoji=1&tfo=1&in=香港+台湾
|
||||
⚠️ ☞ “你的订阅连接”#emoji=1&tfo=1&in=香港+台湾
|
||||
❖ 本地资源片段引用, 请将参数如 "#𝗶𝗻=𝘅𝘅𝘅." 填入文件第 ① 行
|
||||
❖ 🚦 支持中文, "操作" 以下特殊字符时请先替换 🚦
|
||||
∎ "+"⇒"%2B", 空格⇒"%20", "@"⇒"%40", "&"⇒"%26", "."⇒"\."
|
||||
@@ -173,6 +173,7 @@ var Pdel = mark0 && para1.indexOf("del=") != -1 ? para1.split("del=")[1].split("
|
||||
var typeU = para1.indexOf("type=") != -1 ? para1.split("type=")[1].split("&")[0] : "";
|
||||
var Pfcr = para1.indexOf("fcr=") != -1 ? para1.split("fcr=")[1].split("&")[0] : ""; // force-cellular 参数
|
||||
var Pvia = para1.indexOf("via=") != -1 ? para1.split("via=")[1].split("&")[0] : ""; // via-interface 参数
|
||||
var Paead = para1.indexOf("aead=") != -1 ? para1.split("aead=")[1].split("&")[0] : ""; // vmess aead 参数
|
||||
|
||||
var typeQ = $resource.type? $resource.type:"unsupported" //返回 field 类型参数
|
||||
|
||||
@@ -259,7 +260,7 @@ function ParseUnknown(cnt){
|
||||
|
||||
function ResourceParse() {
|
||||
//预处理，分流/重写等处理完成
|
||||
if (type0 == "Subs-B64Encode") {
|
||||
if (type0 == "Subs-B64Encode") { // subs2QX 负责所有节点的转换
|
||||
total = Subs2QX(Base64.decode(content0), Pudp0, Ptfo0, Pcert0, PTls13);
|
||||
} else if (type0 == "Subs") {
|
||||
total = Subs2QX(content0, Pudp0, Ptfo0, Pcert0, PTls13);
|
||||
@@ -476,7 +477,7 @@ function Type_Check(subs) {
|
||||
|
||||
// 检查节点名字(重复以及空名)等QuanX 不允许的情形，以及多个空格等“不规范”方式
|
||||
function TagCheck_QX(content) {
|
||||
typefix = {"shadowsocks":["𝐬𝐬","𝐒𝐒","🅢🅢","🆂🆂","ⓢⓢ","🅂🅂","SS"],"shadowsocksr":["𝐬𝐬𝐫","𝐒𝐒𝐑","🅢🅢🅡","🆂🆂🆁","ⓢⓢⓡ","🅂 🅁","SSR"],"vmess":["𝐯𝐦𝐞𝐬𝐬","𝐕𝐌𝐄𝐒𝐒","🅥🅜🅔🅢🅢","🆅🅼🅴🆂🆂","ⓥⓜⓔⓢⓢ","🅅🄼🄴🅂🅂","VMESS"],"trojan":["𝐭𝐫𝐨𝐣𝐚𝐧","𝐓𝐑𝐎𝐉𝐀𝐍","🅣🅡🅞🅙🅐🅝","🆃🆁🅾🅹🅰🅽","ⓣⓡⓞⓙⓐⓝ","🅃🅁🄾🄹🄰🄽","TROJAN"],"http":["𝐡𝐭𝐭𝐩","𝐇𝐓𝐓𝐏","🅗🅣🅣🅟","🅷🆃🆃🅿","ⓗⓣⓣⓟ","🄷🅃🅃🄿","HTTP"]}
|
||||
typefix = {"shadowsocks":["𝐬𝐬","𝐒𝐒","🅢🅢","🆂🆂","ⓢⓢ","🅂🅂","SS"],"shadowsocksr":["𝐬𝐬𝐫","𝐒𝐒𝐑","🅢🅢🅡","🆂🆂🆁","ⓢⓢⓡ","🅂 🅁","SSR"],"vmess":["𝐯𝐦𝐞𝐬𝐬","𝐕𝐌𝐄𝐒𝐒","🅥🅜🅔🅢🅢","🆅🅼🅴🆂🆂","ⓥⓜⓔⓢⓢ","🅅🄼🄴🅂🅂","VMESS"],"trojan":["𝐭𝐫𝐨𝐣𝐚𝐧","𝐓𝐑𝐎𝐉𝐀𝐍","🅣🅡🅞🅙🅐 ","🆃🆁🅾🅹🅰🅽","ⓣⓡⓞⓙⓐⓝ","🅃🅁🄾🄹🄰🄽","TROJAN"],"http":["𝐡𝐭𝐭𝐩","𝐇𝐓𝐓𝐏","🅗🅣🅣🅟","🅷🆃🆃🅿","ⓗⓣⓣⓟ","🄷🅃🅃🄿","HTTP"]}
|
||||
console.log(content)
|
||||
var Olist = content.map(item =>item.trim().replace(/\s{2,}/g," "))
|
||||
//$notify("","",Olist)
|
||||
@@ -485,7 +486,7 @@ function TagCheck_QX(content) {
|
||||
var no=0 ;
|
||||
for (var i = 0; i < Olist.length; i++) {
|
||||
var item = Olist[i] ? Olist[i] : ""
|
||||
typefix["shadowsocks"]=item.indexOf("ssr-protocol")!=-1? typefix["shadowsocksr"] : typefix["shadowsocks"]
|
||||
typefix["shadowsocks"]=item.indexOf("ssr-protocol")!=-1? typefix["shadowsocksr"] : typefix["shadowsocks"]
|
||||
if (item.replace(/ /gm, "").indexOf("tag=") != -1) {
|
||||
var nl = item.slice(item.indexOf("tag"))
|
||||
var nm = nl.slice(nl.indexOf("=") + 1)
|
||||
@@ -614,7 +615,7 @@ function type_suffix(item) {
|
||||
function getnode_type(item,ind) {
|
||||
if(item.trim()!="" && item.indexOf("tag=")!=-1) {
|
||||
ind = !/^(0|1|2|3|4|5|6|7)$/.test(ind) ? 8 : 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"]
|
||||
tp = typefix[item.split("=")[0].trim()][ind]
|
||||
return tp
|
||||
@@ -625,7 +626,7 @@ function getnode_type(item,ind) {
|
||||
// 操作節點類型佔位符
|
||||
function type_handle(item) {
|
||||
if(item.indexOf("node_type_para_prefix")!=-1) {
|
||||
item = item.replace(/node_type_para_prefix(\d{0,1})/g,getnode_type(item,item.split("node_type_para_prefix")[1][0]))
|
||||
item = item.replace(/node_type_para_prefix(\d{0,1})/g,getnode_type(item,item.split("node_ty pe_para_prefix")[1][0]))
|
||||
}
|
||||
return item
|
||||
}
|
||||
@@ -1187,6 +1188,7 @@ function Subs2QX(subs, Pudp, Ptfo, Pcert0, PTls13) {
|
||||
} catch (e) {
|
||||
failedList.push(`<<<\nContent: ${list0[i]}\nError: ${e}`)
|
||||
}
|
||||
if (Paead!="") {node = AeadVmess(node)} // vmess 类型 aead 处理
|
||||
if (node instanceof Array) {
|
||||
for (var j in node) {
|
||||
node[j] = Pudp != 0 ? XUDP(node[j],Pudp) : node[j]
|
||||
@@ -1206,6 +1208,18 @@ function Subs2QX(subs, Pudp, Ptfo, Pcert0, PTls13) {
|
||||
return QXlist;
|
||||
}
|
||||
|
||||
// Vmess Aead 关闭-默认开启
|
||||
function AeadVmess(cnt) {
|
||||
let paead = "aead=false"
|
||||
if (/^vmess\s*\=/.test(cnt)) {
|
||||
cnts = cnt.split(",")
|
||||
cnts.push(paead)
|
||||
//console.log(cnts)
|
||||
cnt=cnts.join(", ")
|
||||
}
|
||||
return cnt
|
||||
}
|
||||
|
||||
// qx 类型 tls/udp 验证问题t
|
||||
function QX_TLS(cnt,Pcert0,PTls13) {
|
||||
var cert0 = Pcert0 == 1? "tls-verification=true, " : "tls-verification=false, "
|
||||
@@ -1911,14 +1925,14 @@ function get_emoji(emojip, sname) {
|
||||
"🇸🇪": ["SE", "Sweden","瑞典"],
|
||||
"🇸🇬": ["SG", "Singapore","SINGAPORE", "新加坡", "狮城", "沪新", "京新", "泉新", "穗新", "深新", "杭新", "广新","廣新","滬新"],
|
||||
"🇹🇭": ["TH", "Thailand", "泰国", "泰國", "曼谷"],
|
||||
"🇹🇷": ["TR", "Turkey", "土耳其", "伊斯坦布尔"],
|
||||
"🇹 ": ["TR", "Turkey", "土耳其", "伊斯坦布尔"],
|
||||
"🇹🇼": ["TW", "Taiwan","TAIWAN", "台湾", "台北", "台中", "新北", "彰化", "CHT", "台", "HINET"],
|
||||
"🇺🇸": ["US", "USA", "America", "United States", "美国", "美", "京美", "波特兰", "达拉斯", "俄勒冈", "凤凰城", "费利蒙", "硅谷", "矽谷", "拉斯维加斯", "洛杉矶", "圣何塞", "圣克拉拉", "西雅图", "芝加哥", "沪美", "哥伦布", "纽约"],
|
||||
"🇻🇳": ["VN", "越南", "胡志明市"],
|
||||
"🇮🇹": ["Italy", "IT", "Nachash", "意大利", "米兰", "義大利"],
|
||||
"🇿🇦": ["South Africa", "南非"],
|
||||
"🇦🇪": ["United Arab Emirates", "阿联酋","AE "],
|
||||
"🇧🇷": ["BR", "Brazil", "巴西", "圣保罗"],
|
||||
"🇧🇷": ["BR", " Brazil", "巴西", "圣保罗"],
|
||||
"🇯🇵": ["JP", "Japan","JAPAN", "日本", "东京", "大阪", "埼玉", "沪日", "穗日", "川日", "中日", "泉日", "杭日", "深日", "辽日", "广日"],
|
||||
"🇦🇷": ["AR", "Argentina", "阿根廷"],
|
||||
"🇳🇴": ["Norway", "挪威", "NO"],
|
||||
|
||||
Reference in New Issue
Block a user