diff --git a/backend/package.json b/backend/package.json index 2df8607d70..310a8dd265 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.376", + "version": "2.14.377", "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 de8e5c36ab..ddf0d06e93 100644 --- a/backend/src/core/proxy-utils/index.js +++ b/backend/src/core/proxy-utils/index.js @@ -231,6 +231,7 @@ function produce(proxies, targetPlatform, type, opts = {}) { // 处理 端口跳跃 if (proxy.ports) { + proxy.ports = String(proxy.ports); if (!['ClashMeta'].includes(targetPlatform)) { proxy.ports = proxy.ports.replace(/\//g, ','); } @@ -420,13 +421,13 @@ function lastParse(proxy) { proxy[`${proxy.network}-opts`].path = [transportPath]; } } - if (['hysteria', 'hysteria2'].includes(proxy.type)) { - if (proxy.ports) { - proxy.ports = proxy.ports.replace(/\//g, ','); - } else { - delete proxy.ports; - } + // if (['hysteria', 'hysteria2', 'tuic'].includes(proxy.type)) { + if (proxy.ports) { + proxy.ports = String(proxy.ports).replace(/\//g, ','); + } else { + delete proxy.ports; } + // } if ( ['hysteria2'].includes(proxy.type) && proxy.obfs && diff --git a/backend/src/core/proxy-utils/producers/surge.js b/backend/src/core/proxy-utils/producers/surge.js index 41ac3b7bd1..0d14ef1251 100644 --- a/backend/src/core/proxy-utils/producers/surge.js +++ b/backend/src/core/proxy-utils/producers/surge.js @@ -15,6 +15,9 @@ const ipVersions = { export default function Surge_Producer() { const produce = (proxy, type, opts = {}) => { proxy.name = proxy.name.replace(/=|,/g, ''); + if (proxy.ports) { + proxy.ports = String(proxy.ports); + } switch (proxy.type) { case 'ss': return shadowsocks(proxy); @@ -676,7 +679,7 @@ function tuic(proxy) { ); if (isPresent(proxy, 'ports')) { - result.append(`,port-hopping=${proxy.ports.replace(/,/g, ';')}`); + result.append(`,port-hopping"=${proxy.ports.replace(/,/g, ';')}"`); } result.appendIfPresent( @@ -945,7 +948,7 @@ function hysteria2(proxy) { result.appendIfPresent(`,password=${proxy.password}`, 'password'); if (isPresent(proxy, 'ports')) { - result.append(`,port-hopping=${proxy.ports.replace(/,/g, ';')}`); + result.append(`,port-hopping="${proxy.ports.replace(/,/g, ';')}"`); } result.appendIfPresent(