diff --git a/backend/package.json b/backend/package.json index a538b65..7b1de3c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.19.12", + "version": "2.19.13", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/core/proxy-utils/parsers/peggy/qx.js b/backend/src/core/proxy-utils/parsers/peggy/qx.js index a79630b..c50f46f 100644 --- a/backend/src/core/proxy-utils/parsers/peggy/qx.js +++ b/backend/src/core/proxy-utils/parsers/peggy/qx.js @@ -145,9 +145,9 @@ port = digits:[0-9]+ { } } -username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); } -password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); } -uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); } +username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); } +password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); } +uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); } method = comma "method" equals cipher:cipher { proxy.cipher = cipher; diff --git a/backend/src/core/proxy-utils/parsers/peggy/qx.peg b/backend/src/core/proxy-utils/parsers/peggy/qx.peg index a1d601a..d77712c 100644 --- a/backend/src/core/proxy-utils/parsers/peggy/qx.peg +++ b/backend/src/core/proxy-utils/parsers/peggy/qx.peg @@ -143,9 +143,9 @@ port = digits:[0-9]+ { } } -username = comma "username" equals username:[^=,]+ { proxy.username = username.join("").trim(); } -password = comma "password" equals password:[^=,]+ { proxy.password = password.join("").trim(); } -uuid = comma "password" equals uuid:[^=,]+ { proxy.uuid = uuid.join("").trim(); } +username = comma "username" equals username:[^,]+ { proxy.username = username.join("").trim(); } +password = comma "password" equals password:[^,]+ { proxy.password = password.join("").trim(); } +uuid = comma "password" equals uuid:[^,]+ { proxy.uuid = uuid.join("").trim(); } method = comma "method" equals cipher:cipher { proxy.cipher = cipher; diff --git a/backend/src/core/proxy-utils/producers/sing-box.js b/backend/src/core/proxy-utils/producers/sing-box.js index d0be30c..6ea6571 100644 --- a/backend/src/core/proxy-utils/producers/sing-box.js +++ b/backend/src/core/proxy-utils/producers/sing-box.js @@ -575,7 +575,7 @@ const hysteriaParser = (proxy = {}) => { smuxParser(proxy.smux, parsedProxy); return parsedProxy; }; -const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => { +const hysteria2Parser = (proxy = {}) => { const parsedProxy = { tag: proxy.name, type: 'hysteria2',