From 3ad42f2c1049511ddc615181649985c3a7b888ed Mon Sep 17 00:00:00 2001 From: xream Date: Wed, 12 Jun 2024 15:16:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Stash=20=E6=94=AF=E6=8C=81=20juicity,?= =?UTF-8?q?=20ssh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- backend/package.json | 2 +- backend/src/core/proxy-utils/index.js | 6 +++++- backend/src/core/proxy-utils/producers/clash.js | 10 +++++++--- backend/src/core/proxy-utils/producers/clashmeta.js | 10 +++++++--- .../src/core/proxy-utils/producers/shadowrocket.js | 10 +++++++--- backend/src/core/proxy-utils/producers/stash.js | 12 +++++++++--- backend/src/core/proxy-utils/producers/uri.js | 6 +++++- 8 files changed, 42 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index d547bf0..8373c86 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Core functionalities: - [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard)) - [x] Shadowrocket (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC) - [x] Clash.Meta (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC) -- [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC) +- [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH) - [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard) ### Supported Target Platforms diff --git a/backend/package.json b/backend/package.json index b235088..7f387ec 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.336", + "version": "2.14.337", "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 91dc9f4..cb92971 100644 --- a/backend/src/core/proxy-utils/index.js +++ b/backend/src/core/proxy-utils/index.js @@ -338,7 +338,11 @@ function lastParse(proxy) { proxy.network = 'tcp'; } } - if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) { + if ( + ['trojan', 'tuic', 'hysteria', 'hysteria2', 'juicity'].includes( + proxy.type, + ) + ) { proxy.tls = true; } if (proxy.network) { diff --git a/backend/src/core/proxy-utils/producers/clash.js b/backend/src/core/proxy-utils/producers/clash.js index eeb95ff..7311f6f 100644 --- a/backend/src/core/proxy-utils/producers/clash.js +++ b/backend/src/core/proxy-utils/producers/clash.js @@ -133,9 +133,13 @@ export default function Clash_Producer() { } } if ( - ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes( - proxy.type, - ) + [ + 'trojan', + 'tuic', + 'hysteria', + 'hysteria2', + 'juicity', + ].includes(proxy.type) ) { delete proxy.tls; } diff --git a/backend/src/core/proxy-utils/producers/clashmeta.js b/backend/src/core/proxy-utils/producers/clashmeta.js index bb8376c..0a0a649 100644 --- a/backend/src/core/proxy-utils/producers/clashmeta.js +++ b/backend/src/core/proxy-utils/producers/clashmeta.js @@ -149,9 +149,13 @@ export default function ClashMeta_Producer() { } } if ( - ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes( - proxy.type, - ) + [ + 'trojan', + 'tuic', + 'hysteria', + 'hysteria2', + 'juicity', + ].includes(proxy.type) ) { delete proxy.tls; } diff --git a/backend/src/core/proxy-utils/producers/shadowrocket.js b/backend/src/core/proxy-utils/producers/shadowrocket.js index 041e06a..f0e1c60 100644 --- a/backend/src/core/proxy-utils/producers/shadowrocket.js +++ b/backend/src/core/proxy-utils/producers/shadowrocket.js @@ -152,9 +152,13 @@ export default function ShadowRocket_Producer() { } } if ( - ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes( - proxy.type, - ) + [ + 'trojan', + 'tuic', + 'hysteria', + 'hysteria2', + 'juicity', + ].includes(proxy.type) ) { delete proxy.tls; } diff --git a/backend/src/core/proxy-utils/producers/stash.js b/backend/src/core/proxy-utils/producers/stash.js index b6585ac..0ebabd0 100644 --- a/backend/src/core/proxy-utils/producers/stash.js +++ b/backend/src/core/proxy-utils/producers/stash.js @@ -21,6 +21,8 @@ export default function Stash_Producer() { 'wireguard', 'hysteria', 'hysteria2', + 'ssh', + 'juicity', ].includes(proxy.type) || (proxy.type === 'ss' && ![ @@ -232,9 +234,13 @@ export default function Stash_Producer() { } } if ( - ['trojan', 'tuic', 'hysteria', 'hysteria2'].includes( - proxy.type, - ) + [ + 'trojan', + 'tuic', + 'hysteria', + 'hysteria2', + 'juicity', + ].includes(proxy.type) ) { delete proxy.tls; } diff --git a/backend/src/core/proxy-utils/producers/uri.js b/backend/src/core/proxy-utils/producers/uri.js index a0410b8..d5be0c4 100644 --- a/backend/src/core/proxy-utils/producers/uri.js +++ b/backend/src/core/proxy-utils/producers/uri.js @@ -16,7 +16,11 @@ export default function URI_Producer() { delete proxy[key]; } } - if (['trojan', 'tuic', 'hysteria', 'hysteria2'].includes(proxy.type)) { + if ( + ['trojan', 'tuic', 'hysteria', 'hysteria2', 'juicity'].includes( + proxy.type, + ) + ) { delete proxy.tls; } if (proxy.server && isIPv6(proxy.server)) {