wenil/amneziavpnphp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(qr): Generate full X-Ray Client config JSON to match Native Amnezia format

Browse Source
This commit is contained in:
infosave2007
2026-01-24 14:56:13 +03:00
parent 1018f96fc4
commit 0139c31557
2 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inc/QrUtil.php
+50 -22
View File
@@ -409,38 +409,66 @@ class QrUtil
return json_encode($decoded, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
}
public static function encodeXrayPayload(string $host, int $port, string $clientId, string $description = '', ?array $reality = null, string $rawConfig = ''): string
public static function encodeXrayPayload(string $host, int $port, string $clientId, string $description = '', ?array $reality = null, string $rawConfig = '', string $flow = ''): string
{
$desc = $description !== '' ? $description : self::resolveServerDescription($host);
// Instead of generating a JSON config, we wrap the raw VLESS URI in a "config" field.
// This matches how WireGuard configs are handled in master branch and is likely what Amnezia expects.
// If rawConfig is not provided, we reconstruct a basic VLESS URI (fallback)
if (empty($rawConfig)) {
// Basic reconstruction if needed, but we should pass valid rawConfig from VpnClient
$security = ($reality && isset($reality['publicKey']) && $reality['publicKey'] !== '') ? 'reality' : 'none';
$type = 'tcp';
$flow = ($security === 'reality') ? 'xtls-rprx-vision' : '';
// Construct full Client XRay config (Amnezia native format expects this structure)
$outbound = [
'protocol' => 'vless',
'settings' => [
'vnext' => [
[
'address' => $host,
'port' => $port,
'users' => [
[
'id' => $clientId,
'encryption' => 'none'
]
]
]
]
],
'streamSettings' => [
'network' => 'tcp',
'security' => ($reality ? 'reality' : 'none')
]
];
$query = http_build_query([
'security' => $security,
'type' => $type,
'flow' => $flow,
'sni' => $reality['serverName'] ?? '',
'pbk' => $reality['publicKey'] ?? '',
'fp' => $reality['fingerprint'] ?? 'chrome',
'sid' => $reality['shortId'] ?? ''
]);
$rawConfig = "vless://$clientId@$host:$port?$query";
if ($flow !== '') {
$outbound['settings']['vnext'][0]['users'][0]['flow'] = $flow;
}
if ($reality) {
$outbound['streamSettings']['realitySettings'] = [
'fingerprint' => $reality['fingerprint'] ?? 'chrome',
'serverName' => $reality['serverName'] ?? '',
'publicKey' => $reality['publicKey'] ?? '',
'shortId' => $reality['shortId'] ?? '',
'spiderX' => ''
];
}
$fullConfig = [
'log' => ['loglevel' => 'warning'],
'inbounds' => [
[
'listen' => '127.0.0.1',
'port' => 10808,
'protocol' => 'socks',
'settings' => ['udp' => true]
]
],
'outbounds' => [$outbound]
];
$envelope = [
'containers' => [
[
'xray' => [
'isThirdPartyConfig' => true,
// Pass raw VLESS URI directly, without JSON wrapper
'last_config' => $rawConfig,
// No isThirdPartyConfig flag - treats as native container
'last_config' => json_encode($fullConfig, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT),
'port' => (string) $port,
'transport_proto' => 'tcp'
],
inc/VpnClient.php
+3 -2
View File
@@ -970,6 +970,7 @@ class VpnClient
$fragment = $parsed['fragment'] ?? '';
parse_str($parsed['query'] ?? '', $query);
$flow = $query['flow'] ?? '';
$reality = null;
if (($query['security'] ?? '') === 'reality') {
@@ -981,8 +982,8 @@ class VpnClient
];
}
// Use QrUtil to encode correct X-Ray payload
$payloadXray = QrUtil::encodeXrayPayload($host, $port, $clientId, $fragment, $reality, $config);
// Use QrUtil to encode correct X-Ray payload (Native Amnezia Client Config)
$payloadXray = QrUtil::encodeXrayPayload($host, $port, $clientId, $fragment, $reality, $config, $flow);
return QrUtil::pngBase64($payloadXray);
}
}