diff --git a/backend/package.json b/backend/package.json index 224ae70..3ff8488 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.379", + "version": "2.14.380", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/core/proxy-utils/index.js b/backend/src/core/proxy-utils/index.js index 4f2a4f0..57e0f88 100644 --- a/backend/src/core/proxy-utils/index.js +++ b/backend/src/core/proxy-utils/index.js @@ -313,6 +313,19 @@ function safeMatch(parser, line) { } } +function formatTransportPath(path) { + if (typeof path === 'string' || typeof path === 'number') { + path = String(path).trim(); + + if (path === '') { + return '/'; + } else if (!path.startsWith('/')) { + return '/' + path; + } + } + return path; +} + function lastParse(proxy) { if (proxy.interface) { proxy['interface-name'] = proxy.interface; @@ -341,6 +354,17 @@ function lastParse(proxy) { delete proxy['ws-headers']; } + const transportPath = proxy[`${proxy.network}-opts`]?.path; + + if (Array.isArray(transportPath)) { + proxy[`${proxy.network}-opts`].path = transportPath.map((item) => + formatTransportPath(item), + ); + } else if (transportPath != null) { + proxy[`${proxy.network}-opts`].path = + formatTransportPath(transportPath); + } + if (proxy.type === 'trojan') { if (proxy.network === 'tcp') { delete proxy.network; @@ -501,18 +525,6 @@ function lastParse(proxy) { proxy[`${proxy.network}-opts`].path = ['/']; } } - const transportPath = proxy[`${proxy.network}-opts`]?.path; - if (Array.isArray(transportPath)) { - transportPath.forEach((path, index) => { - if (!path.startsWith('/')) { - proxy[`${proxy.network}-opts`].path[index] = `/${path}`; - } - }); - } else if (transportPath) { - if (!transportPath.startsWith('/')) { - proxy[`${proxy.network}-opts`].path = `/${transportPath}`; - } - } if (['', 'off'].includes(proxy.sni)) { proxy['disable-sni'] = true; }