feat: Surge Hysteria 2 支持 Gecko 混淆

Author: xream

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.31.2",
+  "version": "2.31.3",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "packageManager": "pnpm@11.0.9",

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

@@ -420,7 +420,7 @@ wireguard = tag equals "wireguard" (section_name/no_error_alert/ip_version/under
     proxy.type = "wireguard-surge";
     handleShadowTLS();
 }
-hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_verification/client_cert/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/salamander_password/others)* {
+hysteria2 = tag equals "hysteria2" address (no_error_alert/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/sni/tls_verification/client_cert/passwordk/tls_fingerprint/download_bandwidth/ecn/shadow_tls_version/shadow_tls_sni/shadow_tls_password/block_quic/port_hopping_interval/salamander_password/gecko_password/others)* {
     proxy.type = "hysteria2";
     handleShadowTLS();
 }
@@ -595,6 +595,7 @@ token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }
 salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); proxy.obfs = 'salamander'; }
+gecko_password = comma "gecko-password" equals match:[^,]+ { proxy['obfs-password'] = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); proxy.obfs = 'gecko'; }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

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

@@ -1297,8 +1297,13 @@ function wireguard_surge(proxy) {
 }
 
 function hysteria2(proxy) {
-    if (proxy['obfs-password'] && proxy.obfs != 'salamander') {
-        throw unsupported(`only salamander obfs is supported`);
+    const obfsPasswordField = {
+        salamander: 'salamander-password',
+        gecko: 'gecko-password',
+    }[proxy.obfs];
+
+    if (proxy['obfs-password'] && !obfsPasswordField) {
+        throw unsupported(`only salamander and gecko obfs are supported`);
     }
 
     const result = new Result(proxy);
@@ -1316,8 +1321,8 @@ function hysteria2(proxy) {
         result.append(`,port-hopping-interval=${proxy['hop-interval']}`);
     }
 
-    if (proxy['obfs-password'] && proxy.obfs == 'salamander') {
-        result.append(`,salamander-password="${proxy['obfs-password']}"`);
+    if (proxy['obfs-password'] && obfsPasswordField) {
+        result.append(`,${obfsPasswordField}="${proxy['obfs-password']}"`);
     }
 
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];

backend/src/test/proxy-parsers/v2ray-and-platforms.spec.js

@@ -3714,6 +3714,20 @@ describe('Platform raw-format parser coverage', function () {
                     ports: '8443-8445',
                 },
             },
+            {
+                title: 'parses hysteria2 gecko obfs lines',
+                input: 'Surge Hysteria2 Gecko = hysteria2,surge-hy2.example.com,443,password=secret,gecko-password="mask",sni=peer.example.com',
+                expected: {
+                    type: 'hysteria2',
+                    name: 'Surge Hysteria2 Gecko',
+                    server: 'surge-hy2.example.com',
+                    port: 443,
+                    password: 'secret',
+                    obfs: 'gecko',
+                    'obfs-password': 'mask',
+                    sni: 'peer.example.com',
+                },
+            },
             {
                 title: 'parses external definitions with exec, args, local-port and addresses',
                 input: 'Surge External = external, exec="/usr/bin/ssh", local-port="1080", args="-D", args="localhost:1080", addresses="[2001:db8::1]", addresses="1.1.1.1"',

backend/src/test/proxy-producers/text.spec.js

@@ -903,6 +903,22 @@ describe('Proxy text producers', function () {
         );
     });
 
+    it('produces Surge Hysteria2 gecko obfs lines', function () {
+        const output = produceExternal('Surge', {
+            type: 'hysteria2',
+            name: 'Surge Hysteria2 Gecko',
+            server: 'hy2.example.com',
+            port: 443,
+            password: 'secret',
+            obfs: 'gecko',
+            'obfs-password': 'mask',
+        });
+
+        expect(output).to.equal(
+            'Surge Hysteria2 Gecko=hysteria2,hy2.example.com,443,password="secret",gecko-password="mask"',
+        );
+    });
+
     it('produces Surge Snell v6 and filters v6 obfs', function () {
         const { result: output, errors } = captureErrors(() =>
             ProxyUtils.produce(