From 04b4fb438487ada373fb3e6437b4cdb28b5174de Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Mon, 20 Apr 2026 16:38:33 +0200 Subject: [PATCH] finalmask Co-Authored-By: Alireza Ahmadi --- web/assets/js/model/outbound.js | 8 + web/html/form/client.html | 79 +- web/html/form/inbound.html | 30 +- web/html/form/outbound.html | 500 +++++----- web/html/form/protocol/shadowsocks.html | 114 ++- web/html/form/protocol/socks.html | 45 +- web/html/form/protocol/trojan.html | 63 +- web/html/form/protocol/tun.html | 85 +- web/html/form/protocol/vless.html | 2 +- web/html/form/protocol/vmess.html | 7 +- web/html/form/protocol/wireguard.html | 16 +- web/html/form/reality_settings.html | 6 +- web/html/form/stream/stream_finalmask.html | 217 +++-- web/html/form/stream/stream_grpc.html | 2 +- web/html/form/stream/stream_httpupgrade.html | 11 +- web/html/form/stream/stream_hysteria.html | 39 +- web/html/form/stream/stream_kcp.html | 23 +- web/html/form/stream/stream_settings.html | 53 +- web/html/form/stream/stream_sockopt.html | 15 +- web/html/form/stream/stream_tcp.html | 29 +- web/html/form/stream/stream_ws.html | 8 +- web/html/form/stream/stream_xhttp.html | 67 +- web/html/modals/inbound_info_modal.html | 949 +++++++++---------- web/html/modals/inbound_modal.html | 199 ++-- 24 files changed, 1341 insertions(+), 1226 deletions(-) diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js index b8ec4c12..c0e7b03d 100644 --- a/web/assets/js/model/outbound.js +++ b/web/assets/js/model/outbound.js @@ -579,6 +579,8 @@ class UdpMask extends CommonClass { case 'header-dns': case 'xdns': return { domain: settings.domain || '' }; + case 'xicmp': + return { ip: settings.ip || '', id: settings.id ?? 0 }; case 'mkcp-original': case 'header-dtls': case 'header-srtp': @@ -586,6 +588,12 @@ class UdpMask extends CommonClass { case 'header-wechat': case 'header-wireguard': return {}; // No settings needed + case 'header-custom': + return { client: [], server: [] }; + case 'noise': + return { reset: 0, noise: [] }; + case 'sudoku': + return { ascii: '', customTable: '', customTables: [], paddingMin: 0, paddingMax: 0 }; default: return settings; } diff --git a/web/html/form/client.html b/web/html/form/client.html index da19fe8f..ef0cfb0a 100644 --- a/web/html/form/client.html +++ b/web/html/form/client.html @@ -1,6 +1,5 @@ {{define "form/client"}} - + @@ -11,14 +10,12 @@ {{ i18n "pages.inbounds.emailDesc" }} {{ i18n "pages.inbounds.email" }} - + - + Auth Password - + - + - - + + [[ key ]] @@ -76,8 +67,7 @@ {{ i18n "pages.inbounds.subscriptionDesc" }} Subscription - + @@ -92,8 +82,7 @@ - + @@ -108,11 +97,9 @@ - + - + - + - + [[ SizeFormatter.sizeFormat(clientStats.up) ]] / [[ SizeFormatter.sizeFormat(clientStats.down) ]] ([[ SizeFormatter.sizeFormat(clientStats.up + clientStats.down) ]]) @@ -170,19 +151,15 @@ - - + - - + + - - + + Expired diff --git a/web/html/form/inbound.html b/web/html/form/inbound.html index 4e89024d..736a1fd4 100644 --- a/web/html/form/inbound.html +++ b/web/html/form/inbound.html @@ -1,7 +1,6 @@ {{define "form/inbound"}} - + @@ -10,8 +9,7 @@ - + [[ p ]] @@ -31,8 +29,7 @@ - + @@ -45,8 +42,7 @@ - + @@ -55,10 +51,8 @@ - + {{ i18n "pages.inbounds.periodicTrafficReset.never" }} {{ i18n @@ -98,13 +91,10 @@ - - diff --git a/web/html/form/outbound.html b/web/html/form/outbound.html index 21bc11fc..0deb8ee1 100644 --- a/web/html/form/outbound.html +++ b/web/html/form/outbound.html @@ -1,14 +1,11 @@ {{define "form/outbound"}} - - + - + [[ y ]] @@ -25,8 +22,7 @@ diff --git a/web/html/form/stream/stream_kcp.html b/web/html/form/stream/stream_kcp.html index 11f89ebd..e74dd3ea 100644 --- a/web/html/form/stream/stream_kcp.html +++ b/web/html/form/stream/stream_kcp.html @@ -1,32 +1,25 @@ {{define "form/streamKCP"}} - + - + - + - + - + - + - + -{{end}} +{{end}} \ No newline at end of file diff --git a/web/html/form/stream/stream_settings.html b/web/html/form/stream/stream_settings.html index 700fe793..c0397d96 100644 --- a/web/html/form/stream/stream_settings.html +++ b/web/html/form/stream/stream_settings.html @@ -1,65 +1,62 @@ {{define "form/streamSettings"}} - - - - TCP (RAW) - mKCP - WebSocket - gRPC - HTTPUpgrade - XHTTP - - + + + + TCP (RAW) + mKCP + WebSocket + gRPC + HTTPUpgrade + XHTTP + + - - -{{end}} +{{end}} \ No newline at end of file diff --git a/web/html/form/stream/stream_tcp.html b/web/html/form/stream/stream_tcp.html index 3024ef77..2fb69cb0 100644 --- a/web/html/form/stream/stream_tcp.html +++ b/web/html/form/stream/stream_tcp.html @@ -5,11 +5,13 @@ - + - + {{ i18n "pages.inbounds.stream.general.request" }} @@ -24,7 +26,8 @@ @@ -33,11 +36,14 @@ - + - - + + @@ -54,14 +60,17 @@ - + - + - + @@ -69,4 +78,4 @@ -{{end}} +{{end}} \ No newline at end of file diff --git a/web/html/form/stream/stream_ws.html b/web/html/form/stream/stream_ws.html index 4c71a516..d3885ad6 100644 --- a/web/html/form/stream/stream_ws.html +++ b/web/html/form/stream/stream_ws.html @@ -17,13 +17,15 @@ - + - + -{{end}} +{{end}} \ No newline at end of file diff --git a/web/html/form/stream/stream_xhttp.html b/web/html/form/stream/stream_xhttp.html index 8fe836d0..15c6161a 100644 --- a/web/html/form/stream/stream_xhttp.html +++ b/web/html/form/stream/stream_xhttp.html @@ -1,6 +1,5 @@ {{define "form/streamXHTTP"}} - + @@ -8,12 +7,10 @@ - + - +