feat: Loon 支持 tls-profile; sing-box 支持 packet-encoding, global-padding, authenticated-length; 优化 packet-encoding 转换逻辑

Author: xream

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

@@ -801,6 +801,16 @@ function lastParse(proxy) {
     if (['vless'].includes(proxy.type)) {
         proxy.network = proxy.network || 'tcp';
     }
+    if (
+        ['vmess', 'vless'].includes(proxy.type) &&
+        proxy['packet-encoding'] == null
+    ) {
+        if (proxy.xudp) {
+            proxy['packet-encoding'] = 'xudp';
+        } else if (proxy['packet-addr']) {
+            proxy['packet-encoding'] = 'packetaddr';
+        }
+    }
     if (
         [
             'trojan',

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

@@ -855,8 +855,9 @@ function URI_VMess() {
                         const normalizedTransportHost =
                             getIfNotBlank(transportHost);
                         if (proxy.network === 'h2') {
-                            const h2Hosts =
-                                splitURIHostList(normalizedTransportHost);
+                            const h2Hosts = splitURIHostList(
+                                normalizedTransportHost,
+                            );
                             if (h2Hosts) {
                                 opts.host = h2Hosts;
                             }
@@ -1820,14 +1821,15 @@ function URI_VLESS() {
         proxy['tls-fingerprint'] = getIfPresent(params.pcs);
         proxy._h2 = /(TRUE)|1/i.test(params.h2);
 
-        switch (`${params.packetEncoding || ''}`.toLowerCase()) {
+        switch (`${params.packetEncoding || ''}`.trim().toLowerCase()) {
             case 'none':
+                proxy['packet-encoding'] = '';
                 break;
             case 'packet':
-                proxy['packet-addr'] = true;
+                proxy['packet-encoding'] = 'packetaddr';
                 break;
             default:
-                proxy.xudp = true;
+                proxy['packet-encoding'] = 'xudp';
                 break;
         }
 

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

@@ -54,35 +54,35 @@ shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs
         $set(proxy, "plugin-opts.path", obfs.path);
     }
 }
-vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
+vmess = tag equals "vmess"i address method uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/vmess_alterId/fast_open/udp_relay/ip_mode/public_key/short_id/block_quic/others)* {
     proxy.type = "vmess";
     proxy.cipher = proxy.cipher || "none";
     proxy.alterId = proxy.alterId || 0;
     handleTransport();
 }
-vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
+vless = tag equals "vless"i address uuid (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/fast_open/udp_relay/ip_mode/flow/public_key/short_id/block_quic/others)* {
     proxy.type = "vless";
     handleTransport();
 }
-trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+trojan = tag equals "trojan"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "trojan";
     handleTransport();
 }
-anytls = tag equals "anytls"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/idle_session_check_interval/idle_session_timeout/min_idle_session/max_stream_count/others)* {
+anytls = tag equals "anytls"i address password (transport/transport_host/transport_path/over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/fast_open/udp_relay/ip_mode/block_quic/idle_session_check_interval/idle_session_timeout/min_idle_session/max_stream_count/others)* {
     proxy.type = "anytls";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/udp_relay/fast_open/download_bandwidth/server_ports/hop_interval/salamander_password/ecn/ip_mode/block_quic/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/udp_relay/fast_open/download_bandwidth/server_ports/hop_interval/salamander_password/ecn/ip_mode/block_quic/others)* {
     proxy.type = "hysteria2";
 }
-https = tag equals "https"i address (username password)? (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+https = tag equals "https"i address (username password)? (tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
     proxy.tls = true;
 }
 http = tag equals "http"i address (username password)? (fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "http";
 }
-socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/fast_open/udp_relay/ip_mode/block_quic/others)* {
+socks5 = tag equals "socks5"i address (username password)? (over_tls/tls_name/sni/tls_verification/tls_cert_sha256/tls_pubkey_sha256/tls_profile/fast_open/udp_relay/ip_mode/block_quic/others)* {
     proxy.type = "socks5";
 }
 
@@ -184,6 +184,7 @@ sni = comma "sni" equals match:[^,]+ { proxy.sni = match.join("").replace(/^"(.*
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }
 tls_cert_sha256 = comma "tls-cert-sha256" equals match:[^,]+ { proxy["tls-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 tls_pubkey_sha256 = comma "tls-pubkey-sha256" equals match:[^,]+ { proxy["tls-pubkey-sha256"] = match.join("").replace(/^"(.*)"$/, '$1'); }
+tls_profile = comma "tls-profile" equals match:[^,]+ { proxy["client-fingerprint"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 
 flow = comma "flow" equals match:[^,]+ { proxy["flow"] = match.join("").replace(/^"(.*)"$/, '$1'); }
 public_key = comma "public-key" equals match:[^,]+ { proxy["reality-opts"] = proxy["reality-opts"] || {}; proxy["reality-opts"]["public-key"] = match.join("").replace(/^"(.*)"$/, '$1'); }

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

@@ -62,6 +62,15 @@ export default function Loon_Producer() {
     return { produce };
 }
 
+function appendTlsProfile(result, proxy) {
+    if (
+        isPresent(proxy, 'client-fingerprint') &&
+        `${proxy['client-fingerprint']}`.trim() !== ''
+    ) {
+        result.append(`,tls-profile=${proxy['client-fingerprint']}`);
+    }
+}
+
 function shadowsocks(proxy) {
     const result = new Result(proxy);
     if (
@@ -305,6 +314,7 @@ function trojan(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    appendTlsProfile(result, proxy);
 
     // sni
     result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
@@ -360,6 +370,7 @@ function anytls(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    appendTlsProfile(result, proxy);
 
     // sni
     result.appendIfPresent(`,tls-name=${proxy.sni}`, 'sni');
@@ -441,6 +452,9 @@ function vmess(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    if (proxy.tls || isReality) {
+        appendTlsProfile(result, proxy);
+    }
 
     if (isReality) {
         result.appendIfPresent(`,sni=${proxy.sni}`, 'sni');
@@ -551,6 +565,9 @@ function vless(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    if (proxy.tls || isReality || isXtls) {
+        appendTlsProfile(result, proxy);
+    }
 
     if (isXtls) {
         result.appendIfPresent(`,flow=${proxy.flow}`, 'flow');
@@ -612,6 +629,9 @@ function http(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    if (proxy.tls) {
+        appendTlsProfile(result, proxy);
+    }
 
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
@@ -645,6 +665,9 @@ function socks5(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    if (proxy.tls) {
+        appendTlsProfile(result, proxy);
+    }
 
     // tfo
     result.appendIfPresent(`,tfo=${proxy.tfo}`, 'tfo');
@@ -774,6 +797,7 @@ function hysteria2(proxy) {
         `,skip-cert-verify=${proxy['skip-cert-verify']}`,
         'skip-cert-verify',
     );
+    appendTlsProfile(result, proxy);
 
     if (proxy['obfs-password'] && proxy.obfs == 'salamander') {
         result.append(`,salamander-password=${proxy['obfs-password']}`);

backend/src/core/proxy-utils/producers/sing-box.js

@@ -727,6 +727,39 @@ const snellParser = (proxy = {}) => {
     return parsedProxy;
 };
 
+const singBoxPacketEncodings = ['', 'packetaddr', 'xudp'];
+
+const normalizeSingBoxPacketEncoding = (value) => {
+    const packetEncoding = `${value}`.trim().toLowerCase();
+    if (singBoxPacketEncodings.includes(packetEncoding)) {
+        return packetEncoding;
+    }
+    return undefined;
+};
+
+const vmessVlessPacketEncodingParser = (proxy, parsedProxy) => {
+    if (proxy['packet-encoding'] != null) {
+        const packetEncoding = normalizeSingBoxPacketEncoding(
+            proxy['packet-encoding'],
+        );
+        if (packetEncoding != null) parsedProxy.packet_encoding = packetEncoding;
+    } else if (proxy.xudp) {
+        parsedProxy.packet_encoding = 'xudp';
+    } else if (proxy['packet-addr']) {
+        parsedProxy.packet_encoding = 'packetaddr';
+    }
+};
+
+const vmessProtocolOptionsParser = (proxy, parsedProxy) => {
+    vmessVlessPacketEncodingParser(proxy, parsedProxy);
+    if (proxy['global-padding'] != null) {
+        parsedProxy.global_padding = !!proxy['global-padding'];
+    }
+    if (proxy['authenticated-length'] != null) {
+        parsedProxy.authenticated_length = !!proxy['authenticated-length'];
+    }
+};
+
 const vmessParser = (proxy = {}) => {
     const parsedProxy = {
         tag: proxy.name,
@@ -751,7 +784,7 @@ const vmessParser = (proxy = {}) => {
         parsedProxy.security = 'auto';
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
-    if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
+    vmessProtocolOptionsParser(proxy, parsedProxy);
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
     if (proxy.network === 'h2') h2Parser(proxy, parsedProxy);
@@ -778,7 +811,7 @@ const vlessParser = (proxy = {}) => {
     };
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
-    if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
+    vmessVlessPacketEncodingParser(proxy, parsedProxy);
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     // if (['xtls-rprx-vision', ''].includes(proxy.flow)) parsedProxy.flow = proxy.flow;
     if (proxy.flow != null) parsedProxy.flow = proxy.flow;

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

@@ -134,13 +134,9 @@ function getTransportHost(network, transportOpts = {}) {
 function normalizeVmessSecurity(security) {
     if (
         security &&
-        ![
-            'aes-128-gcm',
-            'chacha20-poly1305',
-            'auto',
-            'none',
-            'zero',
-        ].includes(security)
+        !['aes-128-gcm', 'chacha20-poly1305', 'auto', 'none', 'zero'].includes(
+            security,
+        )
     ) {
         return 'auto';
     }
@@ -749,10 +745,28 @@ function vless(proxy) {
     }
 
     let packetEncoding = '';
-    if (proxy['packet-addr']) {
-        packetEncoding = '&packetEncoding=packet';
-    } else if (proxy.udp === true && !proxy.xudp) {
-        packetEncoding = '&packetEncoding=none';
+    let canonicalPacketEncoding;
+    if (proxy['packet-encoding'] != null) {
+        canonicalPacketEncoding = `${proxy['packet-encoding']}`
+            .trim()
+            .toLowerCase();
+    } else if (proxy.xudp) {
+        canonicalPacketEncoding = 'xudp';
+    } else if (proxy['packet-addr']) {
+        canonicalPacketEncoding = 'packetaddr';
+    } else if (proxy.udp === true) {
+        canonicalPacketEncoding = '';
+    }
+    switch (canonicalPacketEncoding) {
+        case '':
+            packetEncoding = '&packetEncoding=none';
+            break;
+        case 'packetaddr':
+            packetEncoding = '&packetEncoding=packet';
+            break;
+        case 'xudp':
+            packetEncoding = '&packetEncoding=xudp';
+            break;
     }
 
     return `vless://${proxy.uuid}@${proxy.server}:${

backend/src/test/proxy-parsers/pipeline.spec.js

@@ -202,6 +202,26 @@ FINAL,DIRECT
         }
     });
 
+    it('prefers xudp over packet-addr when normalizing legacy packet fields', function () {
+        const proxy = parseOne(
+            JSON.stringify({
+                name: 'vless-legacy-packet-conflict',
+                type: 'vless',
+                server: 'vless.example.com',
+                port: 443,
+                uuid: UUID,
+                xudp: true,
+                'packet-addr': true,
+            }),
+        );
+
+        expectSubset(proxy, {
+            type: 'vless',
+            name: 'vless-legacy-packet-conflict',
+            'packet-encoding': 'xudp',
+        });
+    });
+
     it('accepts every Clash-supported proxy type as inline objects', function () {
         const supportedTypes = [
             'tailscale',