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 17:48:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 兼容部分不带节点名的 URI

Browse Source
This commit is contained in:
xream 2024-01-08 09:44:53 +08:00
parent ee2fcc7ee3
commit c51f3511dd
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
2 changed files with 11 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.142", "version": "2.14.143",
"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": {

14
backend/src/core/proxy-utils/parsers/index.js
View File

@ -333,10 +333,13 @@ function URI_VLESS() {
line = line.split('vless://')[1]; line = line.split('vless://')[1];
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
let [__, uuid, server, port, ___, addons = '', name] = let [__, uuid, server, port, ___, addons = '', name] =
/^(.*?)@(.*?):(\d+)\/?(\?(.*?))?(?:#(.*?))$/.exec(line); /^(.*?)@(.*?):(\d+)\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
port = parseInt(`${port}`, 10); port = parseInt(`${port}`, 10);
uuid = decodeURIComponent(uuid); uuid = decodeURIComponent(uuid);
name = decodeURIComponent(name) ?? `VLESS ${server}:${port}`; if (name != null) {
name = decodeURIComponent(name);
}
name = name ?? `VLESS ${server}:${port}`;
const proxy = { const proxy = {
type: 'vless', type: 'vless',
name, name,
@ -415,13 +418,16 @@ function URI_Hysteria2() {
line = line.split(/(hysteria2|hy2):\/\//)[2]; line = line.split(/(hysteria2|hy2):\/\//)[2];
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
let [__, password, server, ___, port, ____, addons = '', name] = let [__, password, server, ___, port, ____, addons = '', name] =
/^(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))$/.exec(line); /^(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
port = parseInt(`${port}`, 10); port = parseInt(`${port}`, 10);
if (isNaN(port)) { if (isNaN(port)) {
port = 443; port = 443;
} }
password = decodeURIComponent(password); password = decodeURIComponent(password);
name = decodeURIComponent(name) ?? `Hysteria2 ${server}:${port}`; if (name != null) {
name = decodeURIComponent(name);
}
name = name ?? `Hysteria2 ${server}:${port}`;
const proxy = { const proxy = {
type: 'hysteria2', type: 'hysteria2',