From 532be2ff8cb9289d889a25b9c43c74b78cc7f57d Mon Sep 17 00:00:00 2001 From: xream Date: Tue, 27 May 2025 19:45:45 +0800 Subject: [PATCH] =?UTF-8?q?Stash=20=E6=AD=A3=E5=BC=8F=E7=89=88=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20VLESS=20REALITY(xtls-rprx-vision)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package.json | 2 +- .../src/core/proxy-utils/producers/stash.js | 8 +-- backend/src/utils/user-agent.js | 72 +++++++++---------- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/backend/package.json b/backend/package.json index 087f3e0..820b506 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.19.54", + "version": "2.19.55", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/core/proxy-utils/producers/stash.js b/backend/src/core/proxy-utils/producers/stash.js index 7658370..3e8ef5e 100644 --- a/backend/src/core/proxy-utils/producers/stash.js +++ b/backend/src/core/proxy-utils/producers/stash.js @@ -44,11 +44,9 @@ export default function Stash_Producer() { '2022-blake3-aes-256-gcm', ].includes(proxy.cipher)) || (proxy.type === 'snell' && String(proxy.version) === '4') || - (opts['include-unsupported-proxy'] - ? proxy.type === 'vless' && - proxy['reality-opts'] && - !['xtls-rprx-vision'].includes(proxy.flow) - : proxy.type === 'vless' && proxy['reality-opts']) + (proxy.type === 'vless' && + proxy['reality-opts'] && + !['xtls-rprx-vision'].includes(proxy.flow)) ) { return false; } else if (proxy['underlying-proxy'] || proxy['dialer-proxy']) { diff --git a/backend/src/utils/user-agent.js b/backend/src/utils/user-agent.js index 96e2088..f51eb3d 100644 --- a/backend/src/utils/user-agent.js +++ b/backend/src/utils/user-agent.js @@ -61,41 +61,41 @@ export function getPlatformFromHeaders(headers) { return getPlatformFromUserAgent({ ua, UA, accept }); } export function shouldIncludeUnsupportedProxy(platform, ua) { - try { - const target = getPlatformFromUserAgent({ - UA: ua, - ua: ua.toLowerCase(), - }); - if (!['Stash', 'Egern', 'Loon'].includes(target)) { - return false; - } - const coerceVersion = coerce(ua); - $.log(JSON.stringify(coerceVersion, null, 2)); - const { version } = coerceVersion; - if ( - platform === 'Stash' && - target === 'Stash' && - gte(version, '3.1.0') - ) { - return true; - } - if ( - platform === 'Egern' && - target === 'Egern' && - gte(version, '1.29.0') - ) { - return true; - } - // Loon 的 UA 不规范, version 取出来是 build - if ( - platform === 'Loon' && - target === 'Loon' && - gte(version, '842.0.0') - ) { - return true; - } - } catch (e) { - $.error(`获取版本号失败: ${e}`); - } + // try { + // const target = getPlatformFromUserAgent({ + // UA: ua, + // ua: ua.toLowerCase(), + // }); + // if (!['Stash', 'Egern', 'Loon'].includes(target)) { + // return false; + // } + // const coerceVersion = coerce(ua); + // $.log(JSON.stringify(coerceVersion, null, 2)); + // const { version } = coerceVersion; + // if ( + // platform === 'Stash' && + // target === 'Stash' && + // gte(version, '3.1.0') + // ) { + // return true; + // } + // if ( + // platform === 'Egern' && + // target === 'Egern' && + // gte(version, '1.29.0') + // ) { + // return true; + // } + // // Loon 的 UA 不规范, version 取出来是 build + // if ( + // platform === 'Loon' && + // target === 'Loon' && + // gte(version, '842.0.0') + // ) { + // return true; + // } + // } catch (e) { + // $.error(`获取版本号失败: ${e}`); + // } return false; }