feat: trust-tunnel -> trusttunnel; mihomo 支持 trusttunnel; 修复 Surge trusttunnel 用户名; 优化 shouldIncludeUnsupportedProxy 逻辑

Author: xream

backend/package.json

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

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

@@ -466,7 +466,7 @@ function lastParse(proxy) {
             'hysteria2',
             'juicity',
             'anytls',
-            'trust-tunnel',
+            'trusttunnel',
             'naive',
         ].includes(proxy.type)
     ) {

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

@@ -1266,7 +1266,7 @@ function Clash_All() {
         }
         if (
             ![
-                'trust-tunnel',
+                'trusttunnel',
                 'naive',
                 'anytls',
                 'mieru',

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

@@ -123,7 +123,7 @@ anytls = tag equals "anytls" address (passwordk/reuse/ip_version/underlying_prox
     proxy.tls = true;
 }
 trust_tunnel = tag equals "trust-tunnel" address (usernamek/passwordk/reuse/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_fingerprint/tls_verification/sni/fast_open/tfo/block_quic/others)* {
-    proxy.type = "trust-tunnel";
+    proxy.type = "trusttunnel";
     proxy.tls = true;
 }
 

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

@@ -121,7 +121,7 @@ anytls = tag equals "anytls" address (passwordk/reuse/ip_version/underlying_prox
     proxy.tls = true;
 }
 trust_tunnel = tag equals "trust-tunnel" address (usernamek/passwordk/reuse/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/tls_fingerprint/tls_verification/sni/fast_open/tfo/block_quic/others)* {
-    proxy.type = "trust-tunnel";
+    proxy.type = "trusttunnel";
     proxy.tls = true;
 }
 direct = tag equals "direct" (udp_relay/ip_version/underlying_proxy/tos/allow_other_interface/interface/test_url/test_udp/test_timeout/hybrid/no_error_alert/fast_open/tfo/block_quic/others)* {

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

@@ -174,7 +174,7 @@ export default function Clash_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
-                        'trust-tunnel',
+                        'trusttunnel',
                         'naive',
                     ].includes(proxy.type)
                 ) {

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

@@ -16,9 +16,7 @@ export default function ClashMeta_Producer() {
                 if (opts['include-unsupported-proxy']) return true;
                 if (proxy.type === 'snell' && proxy.version >= 4) {
                     return false;
-                } else if (
-                    ['trust-tunnel', 'juicity', 'naive'].includes(proxy.type)
-                ) {
+                } else if (['juicity', 'naive'].includes(proxy.type)) {
                     return false;
                 } else if (
                     ['ss'].includes(proxy.type) &&
@@ -251,7 +249,7 @@ export default function ClashMeta_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
-                        'trust-tunnel',
+                        'trusttunnel',
                         'naive',
                     ].includes(proxy.type)
                 ) {

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

@@ -11,7 +11,7 @@ export default function Shadowrocket_Producer() {
                     return false;
                 } else if (
                     [
-                        'trust-tunnel',
+                        'trusttunnel',
                         'mieru',
                         'sudoku',
                         'naive',
@@ -227,7 +227,7 @@ export default function Shadowrocket_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
-                        'trust-tunnel',
+                        'trusttunnel',
                         'naive',
                     ].includes(proxy.type)
                 ) {

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

@@ -290,7 +290,7 @@ export default function Stash_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
-                        'trust-tunnel',
+                        'trusttunnel',
                         'naive',
                     ].includes(proxy.type)
                 ) {

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

@@ -67,11 +67,8 @@ export default function Surge_Producer() {
 
             return anytls(proxy);
         }
-        if (
-            opts['include-unsupported-proxy'] &&
-            proxy.type === 'trust-tunnel'
-        ) {
-            return trust_tunnel(proxy);
+        if (opts['include-unsupported-proxy'] && proxy.type === 'trusttunnel') {
+            return trusttunnel(proxy);
         }
         throw new Error(
             `Platform ${targetPlatform} does not support proxy type: ${proxy.type}`,
@@ -372,9 +369,10 @@ function anytls(proxy) {
 
     return result.toString();
 }
-function trust_tunnel(proxy) {
+function trusttunnel(proxy) {
     const result = new Result(proxy);
-    result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
+    result.append(`${proxy.name}=trust-tunnel,${proxy.server},${proxy.port}`);
+    result.appendIfPresent(`,username="${proxy.username}"`, 'username');
     result.appendIfPresent(`,password="${proxy.password}"`, 'password');
 
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];