fix: Surge Hysteria2 输出重复添加 tfo 的 bug

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.67",
+  "version": "2.14.74",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {

backend/src/core/proxy-utils/parsers/index.js

@@ -404,6 +404,53 @@ function URI_VLESS() {
     };
     return { name, test, parse };
 }
+function URI_Hysteria2() {
+    const name = 'URI Hysteria2 Parser';
+    const test = (line) => {
+        return /^hysteria2:\/\//.test(line);
+    };
+    const parse = (line) => {
+        line = line.split('hysteria2://')[1];
+        // eslint-disable-next-line no-unused-vars
+        let [__, password, server, ___, port, addons, name] =
+            /^(.*?)@(.*?)(:(\d+))?\/?\?(.*?)(?:#(.*?))$/.exec(line);
+        port = parseInt(`${port}`, 10);
+        if (isNaN(port)) {
+            port = 443;
+        }
+        password = decodeURIComponent(password);
+        name = decodeURIComponent(name) ?? `Hysteria2 ${server}:${port}`;
+
+        const proxy = {
+            type: 'hysteria2',
+            name,
+            server,
+            port,
+            password,
+        };
+
+        const params = {};
+        for (const addon of addons.split('&')) {
+            const [key, valueRaw] = addon.split('=');
+            let value = valueRaw;
+            value = decodeURIComponent(valueRaw);
+            params[key] = value;
+        }
+
+        proxy.sni = params.sni;
+        if (!proxy.sni && params.peer) {
+            proxy.sni = params.peer;
+        }
+        proxy.obfs = params.obfs;
+        proxy['obfs-password'] = params['obfs-password'];
+        proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.insecure);
+        proxy.tfo = /(TRUE)|1/i.test(params.fastopen);
+        proxy.fingerprint = params.pinSHA256;
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
 
 // Trojan URI format
 function URI_Trojan() {
@@ -798,6 +845,7 @@ export default [
     URI_SSR(),
     URI_VMess(),
     URI_VLESS(),
+    URI_Hysteria2(),
     URI_Trojan(),
     Clash_All(),
     Surge_SS(),

backend/src/core/proxy-utils/parsers/peggy/surge.js

@@ -76,17 +76,17 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
         $set(proxy, "obfs-opts.path", obfs.path);
     }
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/ecn/others)* {
     proxy.type = "tuic";
 }
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/others)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/ecn/others)* {
     proxy.type = "tuic";
     proxy.version = 5;
 }
 wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/test_url/others)* {
     proxy.type = "wireguard-surge";
 }
-hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/download_bandwidth/others)* {
+hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/download_bandwidth/ecn/others)* {
     proxy.type = "hysteria2";
 }
 socks5 = tag equals "socks5" address (username password)? (fast_open/others)* {
@@ -192,6 +192,7 @@ uri = $[^,]+
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 reuse = comma "reuse" equals flag:bool { proxy.reuse = flag; }
+ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 tfo = comma "tfo" equals flag:bool { proxy.tfo = flag; }
 ip_version = comma "ip-version" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
 section_name = comma "section-name" equals match:[^,]+ { proxy["section-name"] = match.join(""); }

backend/src/core/proxy-utils/parsers/peggy/surge.peg

@@ -74,17 +74,17 @@ snell = tag equals "snell" address (snell_version/snell_psk/obfs/obfs_host/obfs_
         $set(proxy, "obfs-opts.path", obfs.path);
     }
 }
-tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/others)* {
+tuic = tag equals "tuic" address (alpn/token/ip_version/tls_verification/sni/fast_open/tfo/ecn/others)* {
     proxy.type = "tuic";
 }
-tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/others)* {
+tuic_v5 = tag equals "tuic-v5" address (alpn/passwordk/uuidk/ip_version/tls_verification/sni/fast_open/tfo/ecn/others)* {
     proxy.type = "tuic";
     proxy.version = 5;
 }
 wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/underlying_proxy/test_url/others)* {
     proxy.type = "wireguard-surge";
 }
-hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/download_bandwidth/others)* {
+hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/test_url/sni/tls_verification/passwordk/download_bandwidth/ecn/others)* {
     proxy.type = "hysteria2";
 }
 socks5 = tag equals "socks5" address (username password)? (fast_open/others)* {
@@ -190,6 +190,7 @@ uri = $[^,]+
 udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 fast_open = comma "fast-open" equals flag:bool { proxy.tfo = flag; }
 reuse = comma "reuse" equals flag:bool { proxy.reuse = flag; }
+ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 tfo = comma "tfo" equals flag:bool { proxy.tfo = flag; }
 ip_version = comma "ip-version" equals match:[^,]+ { proxy["ip-version"] = match.join(""); }
 section_name = comma "section-name" equals match:[^,]+ { proxy["section-name"] = match.join(""); }

backend/src/core/proxy-utils/preprocessors/index.js

@@ -13,13 +13,15 @@ function Base64Encoded() {
     const name = 'Base64 Pre-processor';
 
     const keys = [
-        'dm1lc3M',
-        'c3NyOi8v',
-        'dHJvamFu',
-        'c3M6Ly',
-        'c3NkOi8v',
-        'c2hhZG93',
-        'aHR0c',
+        'dm1lc3M', // vmess
+        'c3NyOi8v', // ssr://
+        'dHJvamFu', // trojan
+        'c3M6Ly', // ss:/
+        'c3NkOi8v', // ssd://
+        'c2hhZG93', // shadow
+        'aHR0c', // htt
+        'dmxlc3M=', // vless
+        'aHlzdGVyaWEy', // hysteria2
     ];
 
     const test = function (raw) {

backend/src/core/proxy-utils/producers/stash.js

@@ -19,6 +19,8 @@ export default function Stash_Producer() {
                             'tuic',
                             'vless',
                             'wireguard',
+                            'hysteria',
+                            'hysteria2',
                         ].includes(proxy.type) ||
                         (proxy.type === 'snell' &&
                             String(proxy.version) === '4') ||
@@ -67,6 +69,7 @@ export default function Stash_Producer() {
                             !isPresent(proxy, 'fast-open')
                         ) {
                             proxy['fast-open'] = proxy.tfo;
+                            delete proxy.tfo;
                         }
                         // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/adapter/outbound/tuic.go#L197
                         if (
@@ -86,6 +89,50 @@ export default function Stash_Producer() {
                             !isPresent(proxy, 'fast-open')
                         ) {
                             proxy['fast-open'] = proxy.tfo;
+                            delete proxy.tfo;
+                        }
+                        if (
+                            isPresent(proxy, 'down') &&
+                            !isPresent(proxy, 'down-speed')
+                        ) {
+                            proxy['down-speed'] = proxy.down;
+                            delete proxy.down;
+                        }
+                        if (
+                            isPresent(proxy, 'up') &&
+                            !isPresent(proxy, 'up-speed')
+                        ) {
+                            proxy['up-speed'] = proxy.up;
+                            delete proxy.up;
+                        }
+                    } else if (proxy.type === 'hysteria2') {
+                        if (
+                            isPresent(proxy, 'password') &&
+                            !isPresent(proxy, 'auth')
+                        ) {
+                            proxy.auth = proxy.password;
+                            delete proxy.password;
+                        }
+                        if (
+                            isPresent(proxy, 'tfo') &&
+                            !isPresent(proxy, 'fast-open')
+                        ) {
+                            proxy['fast-open'] = proxy.tfo;
+                            delete proxy.tfo;
+                        }
+                        if (
+                            isPresent(proxy, 'down') &&
+                            !isPresent(proxy, 'down-speed')
+                        ) {
+                            proxy['down-speed'] = proxy.down;
+                            delete proxy.down;
+                        }
+                        if (
+                            isPresent(proxy, 'up') &&
+                            !isPresent(proxy, 'up-speed')
+                        ) {
+                            proxy['up-speed'] = proxy.up;
+                            delete proxy.up;
                         }
                     } else if (proxy.type === 'wireguard') {
                         proxy.keepalive =

backend/src/core/proxy-utils/producers/surge.js

@@ -320,8 +320,11 @@ function tuic(proxy) {
     );
 
     // tfo
-    result.appendIfPresent(`,tfo=${proxy['fast-open']}`, 'fast-open');
-    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
+    if (isPresent(proxy, 'tfo')) {
+        result.append(`,tfo=${proxy['tfo']}`);
+    } else if (isPresent(proxy, 'fast-open')) {
+        result.append(`,tfo=${proxy['fast-open']}`);
+    }
 
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
@@ -332,6 +335,8 @@ function tuic(proxy) {
         'underlying-proxy',
     );
 
+    result.appendIfPresent(`,ecn=${proxy.ecn}`, 'ecn');
+
     return result.toString();
 }
 
@@ -367,6 +372,9 @@ function wireguard(proxy) {
 }
 
 function hysteria2(proxy) {
+    if (proxy.obfs || proxy['obfs-password']) {
+        throw new Error(`obfs is unsupported`);
+    }
     const result = new Result(proxy);
     result.append(`${proxy.name}=hysteria2,${proxy.server},${proxy.port}`);
 
@@ -388,10 +396,17 @@ function hysteria2(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    result.appendIfPresent(
+        `,server-cert-fingerprint-sha256=${proxy.fingerprint}`,
+        'fingerprint',
+    );
 
     // tfo
-    result.appendIfPresent(`,tfo=${proxy['fast-open']}`, 'fast-open');
-    result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
+    if (isPresent(proxy, 'tfo')) {
+        result.append(`,tfo=${proxy['tfo']}`);
+    } else if (isPresent(proxy, 'fast-open')) {
+        result.append(`,tfo=${proxy['fast-open']}`);
+    }
 
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
@@ -402,6 +417,14 @@ function hysteria2(proxy) {
         'underlying-proxy',
     );
 
+    // download-bandwidth
+    result.appendIfPresent(
+        `,download-bandwidth=${`${proxy['down']}`.match(/\d+/)?.[0] || 0}`,
+        'down',
+    );
+
+    result.appendIfPresent(`,ecn=${proxy.ecn}`, 'ecn');
+
     return result.toString();
 }