Skip to content

feat(subscription): add alpn, ech and fp fallback to VLESS TLS subscription links #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KissSkyOneMoreTime wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat(subscription): add alpn, ech and fp fallback to VLESS TLS subscription links #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af6fe5a
feat(subscription): add alpn, ech and fp fallback to VLESS TLS subscr…
KissSkyOneMoreTime Apr 25, 2026
b1047af
feat(subscription): add alpn, ech and fp fallback to VLESS TLS subscr…
KissSkyOneMoreTime Apr 29, 2026
619b084
stash\shadowrocket feat xhttp,ech config
KissSkyOneMoreTime Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions app/Protocols/ClashMeta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,11 @@ public static function buildVless($password, $server)
if ($path = data_get($protocol_settings, 'network_settings.path'))
$xhttpOpts['path'] = $path;
if ($host = data_get($protocol_settings, 'network_settings.host'))
$xhttpOpts['host'] = $host;
$xhttpOpts['headers'] = ['Host' => $host];
if ($mode = data_get($protocol_settings, 'network_settings.mode'))
$xhttpOpts['mode'] = $mode;
if ($alpn = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.alpn'))
$xhttpOpts['alpn'] = is_array($alpn) ? $alpn : [$alpn];
if (!empty($xhttpOpts))
$array['xhttp-opts'] = $xhttpOpts;
break;
Expand Down Expand Up @@ -799,18 +801,19 @@ protected static function appendUtls(&$array, $protocol_settings)
if ($utls = data_get($protocol_settings, 'utls')) {
if (data_get($utls, 'enabled')) {
$array['client-fingerprint'] = Helper::getTlsFingerprint($utls);
return;
}
}
// fallback: read fingerprint from downloadSettings
if ($fp = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.fingerprint')) {
$array['client-fingerprint'] = $fp;
}
}

protected static function appendEch(&$array, $ech): void
{
if ($normalized = Helper::normalizeEchSettings($ech)) {
$array['ech-opts'] = array_filter([
'enable' => true,
'config' => Helper::toMihomoEchConfig(data_get($normalized, 'config')),
'query-server-name' => data_get($normalized, 'query_server_name'),
], fn($value) => $value !== null);
$array['ech-opts'] = ['enable' => true];
}
}
}
}
27 changes: 25 additions & 2 deletions app/Protocols/General.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ public static function buildVmess($uuid, $server)
}
if ($fp = Helper::getTlsFingerprint(data_get($protocol_settings, 'utls'))) {
$config['fp'] = $fp;
}

}
switch (data_get($protocol_settings, 'network')) {
case 'tcp':
if (data_get($protocol_settings, 'network_settings.header.type', 'none') !== 'none') {
Expand Down Expand Up @@ -175,13 +174,37 @@ public static function buildVless($uuid, $server)
$config['security'] = "tls";
if ($fp = Helper::getTlsFingerprint(data_get($protocol_settings, 'utls'))) {
$config['fp'] = $fp;
} elseif ($fp = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.fingerprint')) {
$config['fp'] = $fp;
}
if ($serverName = data_get($protocol_settings, 'tls_settings.server_name')) {
$config['sni'] = $serverName;
}
if (data_get($protocol_settings, 'tls_settings.allow_insecure')) {
$config['allowInsecure'] = '1';
}
// ALPN
if ($alpn = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.alpn')) {
$config['alpn'] = is_array($alpn)
? implode(',', $alpn)
: $alpn;
}
// ECH
$ech = data_get($protocol_settings, 'tls_settings.ech');
if (data_get($ech, 'enabled')) {
$queryServerName = data_get($ech, 'query_server_name', 'cloudflare-ech.com');
$echConfig = data_get($ech, 'config', '');
// Strip PEM headers and collapse to a single base64 string
$echBase64 = preg_replace('/-----[^-]+-----/', '', $echConfig);
$echBase64 = str_replace(["\r", "\n", ' '], '', trim($echBase64));
if ($echBase64) {
// Embed the config directly; client uses it as echConfigList
$config['ech'] = $echBase64;
} else {
// Fall back to query-server-name so the client fetches via DoH
$config['ech'] = $queryServerName;
}
}
break;
case 2: //reality
$config['security'] = "reality";
Expand Down
9 changes: 9 additions & 0 deletions app/Protocols/Shadowrocket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,15 @@ public static function buildVless($uuid, $server)
}
if ($fp = Helper::getTlsFingerprint(data_get($protocol_settings, 'utls'))) {
$config['fp'] = $fp;
} elseif ($fp = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.fingerprint')) {
$config['fp'] = $fp;
}
$ech = data_get($protocol_settings, 'tls_settings.ech');
if (data_get($ech, 'enabled')) {
$echConfig = data_get($ech, 'config', '');
$echBase64 = preg_replace('/-----[^-]+-----/', '', $echConfig);
$echBase64 = str_replace(["\r", "\n", ' '], '', trim($echBase64));
$config['ech'] = $echBase64 ?: data_get($ech, 'query_server_name', 'cloudflare-ech.com');
}
break;
case 2:
Expand Down
33 changes: 33 additions & 0 deletions app/Protocols/Stash.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,20 @@ public static function buildVmess($uuid, $server)
if ($host = data_get($protocol_settings, 'network_settings.host'))
$array['h2-opts']['host'] = is_array($host) ? $host : [$host];
break;
case 'xhttp':
$array['network'] = 'xhttp';
$xhttpOpts = [];
if ($path = data_get($protocol_settings, 'network_settings.path'))
$xhttpOpts['path'] = $path;
if ($host = data_get($protocol_settings, 'network_settings.host'))
$xhttpOpts['headers'] = ['Host' => $host];
if ($mode = data_get($protocol_settings, 'network_settings.mode'))
$xhttpOpts['mode'] = $mode;
if ($alpn = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.alpn'))
$xhttpOpts['alpn'] = is_array($alpn) ? $alpn : [$alpn];
if (!empty($xhttpOpts))
$array['xhttp-opts'] = $xhttpOpts;
break;
default:
break;
}
Expand All @@ -307,6 +321,8 @@ public function buildVless($uuid, $server)

if ($fingerprint = Helper::getTlsFingerprint(data_get($protocol_settings, 'utls'))) {
$array['client-fingerprint'] = $fingerprint;
} elseif ($fingerprint = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.fingerprint')) {
$array['client-fingerprint'] = $fingerprint;
}

switch (data_get($protocol_settings, 'tls')) {
Expand All @@ -316,6 +332,9 @@ public function buildVless($uuid, $server)
if ($serverName = data_get($protocol_settings, 'tls_settings.server_name')) {
$array['servername'] = $serverName;
}
if (data_get($protocol_settings, 'tls_settings.ech.enabled')) {
$array['ech-opts'] = ['enable' => true];
}
break;
case 2:
$array['tls'] = true;
Expand Down Expand Up @@ -366,6 +385,20 @@ public function buildVless($uuid, $server)
if ($host = data_get($protocol_settings, 'network_settings.host'))
$array['h2-opts']['host'] = is_array($host) ? $host : [$host];
break;
case 'xhttp':
$array['network'] = 'xhttp';
$xhttpOpts = [];
if ($path = data_get($protocol_settings, 'network_settings.path'))
$xhttpOpts['path'] = $path;
if ($host = data_get($protocol_settings, 'network_settings.host'))
$xhttpOpts['headers'] = ['Host' => $host];
if ($mode = data_get($protocol_settings, 'network_settings.mode'))
$xhttpOpts['mode'] = $mode;
if ($alpn = data_get($protocol_settings, 'network_settings.extra.downloadSettings.tlsSettings.alpn'))
$xhttpOpts['alpn'] = is_array($alpn) ? $alpn : [$alpn];
if (!empty($xhttpOpts))
$array['xhttp-opts'] = $xhttpOpts;
break;
}

return $array;
Expand Down