Local-GitHub-Proxy/Sub-Store
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git synced 2025-08-11 21:09:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 兼容更多 Trojan URI 格式

Browse Source
This commit is contained in:
xream 2024-02-08 23:06:39 +08:00
parent e40b9a77c4
commit e97fb1e6d9
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sub-store", "name": "sub-store",
"version": "2.14.213", "version": "2.14.214",
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {

4
backend/src/core/proxy-utils/parsers/peggy/trojan-uri.js
View File

@ -30,7 +30,7 @@ start = (trojan) {
return proxy return proxy
} }
trojan = "trojan://" password:password "@" server:server ":" port:port params? name:name?{ trojan = "trojan://" password:password "@" server:server ":" port:port "/"? params? name:name?{
proxy.type = "trojan"; proxy.type = "trojan";
proxy.password = password; proxy.password = password;
proxy.server = server; proxy.server = server;
@ -79,7 +79,7 @@ port = digits:[0-9]+ {
} }
} }
params = "/"? "?" head:param tail:("&"@param)* { params = "?" head:param tail:("&"@param)* {
proxy["skip-cert-verify"] = toBool(params["allowInsecure"]); proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
proxy.sni = params["sni"] || params["peer"]; proxy.sni = params["sni"] || params["peer"];

4
backend/src/core/proxy-utils/parsers/peggy/trojan-uri.peg
View File

@ -28,7 +28,7 @@ start = (trojan) {
return proxy return proxy
} }
trojan = "trojan://" password:password "@" server:server ":" port:port params? name:name?{ trojan = "trojan://" password:password "@" server:server ":" port:port "/"? params? name:name?{
proxy.type = "trojan"; proxy.type = "trojan";
proxy.password = password; proxy.password = password;
proxy.server = server; proxy.server = server;
@ -77,7 +77,7 @@ port = digits:[0-9]+ {
} }
} }
params = "/"? "?" head:param tail:("&"@param)* { params = "?" head:param tail:("&"@param)* {
proxy["skip-cert-verify"] = toBool(params["allowInsecure"]); proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
proxy.sni = params["sni"] || params["peer"]; proxy.sni = params["sni"] || params["peer"];