[PR #3006] [MERGED] feat: rework xray settings - split client/server data, unify saving, fix tls #3050

New issue

Closed

opened 2026-10-14 21:07:09 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:07:09 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/3006
Author: @yp-amnezia
Created: 8/18/2026
Status: ✅ Merged
Merged: 10/8/2026
Merged by: @vkamn

Base: dev ← Head: feat/split-xray-client-and-server-settings

📝 Commits (10+)

025ad6f Feat: split xray client and server settings
2bf0768 merge dev
c24e2f6 remove test logs
aff0ab7 in-place save and TLS pin
844a78c fixed xhttp/mkcp + tls
6b7d0fd remove check version xray in start connect
8796290 address review findings for the settings split
f8de0c9 reset namespace
5d334f6 reset namespace
30338ea remove template xray

📊 Changes

35 files changed (+2686 additions, -1277 deletions)

View changed files

📝 client/core/configurators/xrayConfigurator.cpp (+360 -461)
📝 client/core/configurators/xrayConfigurator.h (+22 -7)
📝 client/core/controllers/selfhosted/installController.cpp (+331 -30)
📝 client/core/controllers/selfhosted/installController.h (+8 -3)
📝 client/core/controllers/selfhosted/usersController.cpp (+64 -8)
📝 client/core/controllers/selfhosted/usersController.h (+6 -1)
📝 client/core/installers/installerBase.cpp (+1 -1)
📝 client/core/installers/xrayInstaller.cpp (+19 -286)
📝 client/core/models/protocols/xrayProtocolConfig.cpp (+1334 -226)
📝 client/core/models/protocols/xrayProtocolConfig.h (+118 -21)
📝 client/core/protocols/xrayProtocol.cpp (+2 -16)
📝 client/core/utils/constants/configKeys.h (+5 -3)
📝 client/core/utils/constants/protocolConstants.h (+101 -5)
📝 client/core/utils/errorCodes.h (+9 -1)
📝 client/core/utils/errorStrings.cpp (+37 -1)
📝 client/core/utils/selfhosted/scriptsRegistry.cpp (+0 -1)
📝 client/core/utils/selfhosted/scriptsRegistry.h (+1 -2)
📝 client/server_scripts/serverScripts.qrc (+0 -1)
📝 client/server_scripts/xray/configure_container.sh (+52 -13)
📝 client/server_scripts/xray/run_container.sh (+1 -0)

...and 15 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/3006 **Author:** [@yp-amnezia](https://github.com/yp-amnezia) **Created:** 8/18/2026 **Status:** ✅ Merged **Merged:** 10/8/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `feat/split-xray-client-and-server-settings` --- ### 📝 Commits (10+) - [`025ad6f`](https://github.com/amnezia-vpn/amnezia-client/commit/025ad6fe1f71447c2d1770ccd5597017f61c2b53) Feat: split xray client and server settings - [`2bf0768`](https://github.com/amnezia-vpn/amnezia-client/commit/2bf076874db69b7a5acc2865f11a32a54380f242) merge dev - [`c24e2f6`](https://github.com/amnezia-vpn/amnezia-client/commit/c24e2f68bcd7acd2a466fedf1957573f73106fbc) remove test logs - [`aff0ab7`](https://github.com/amnezia-vpn/amnezia-client/commit/aff0ab7e05aa8973a86aab5ac5d3a2bc2914bfc3) in-place save and TLS pin - [`844a78c`](https://github.com/amnezia-vpn/amnezia-client/commit/844a78c2a94a0ad287c3971eb76104f9b0afd46e) fixed xhttp/mkcp + tls - [`6b7d0fd`](https://github.com/amnezia-vpn/amnezia-client/commit/6b7d0fdb202e81f05a81bd577a9202c5a58fa7b9) remove check version xray in start connect - [`8796290`](https://github.com/amnezia-vpn/amnezia-client/commit/8796290b15a9dd08a557df5e19a0cb9abc29cedb) address review findings for the settings split - [`f8de0c9`](https://github.com/amnezia-vpn/amnezia-client/commit/f8de0c992ce166735cd3e88004bc64df0e2d2c96) reset namespace - [`5d334f6`](https://github.com/amnezia-vpn/amnezia-client/commit/5d334f6ff0b63340117ecbcbb8c4cdaf5313cdb9) reset namespace - [`30338ea`](https://github.com/amnezia-vpn/amnezia-client/commit/30338eab9f25b6916a83ab7788a9c8e07f011fdd) remove template xray ### 📊 Changes **35 files changed** (+2686 additions, -1277 deletions) <details> <summary>View changed files</summary> 📝 `client/core/configurators/xrayConfigurator.cpp` (+360 -461) 📝 `client/core/configurators/xrayConfigurator.h` (+22 -7) 📝 `client/core/controllers/selfhosted/installController.cpp` (+331 -30) 📝 `client/core/controllers/selfhosted/installController.h` (+8 -3) 📝 `client/core/controllers/selfhosted/usersController.cpp` (+64 -8) 📝 `client/core/controllers/selfhosted/usersController.h` (+6 -1) 📝 `client/core/installers/installerBase.cpp` (+1 -1) 📝 `client/core/installers/xrayInstaller.cpp` (+19 -286) 📝 `client/core/models/protocols/xrayProtocolConfig.cpp` (+1334 -226) 📝 `client/core/models/protocols/xrayProtocolConfig.h` (+118 -21) 📝 `client/core/protocols/xrayProtocol.cpp` (+2 -16) 📝 `client/core/utils/constants/configKeys.h` (+5 -3) 📝 `client/core/utils/constants/protocolConstants.h` (+101 -5) 📝 `client/core/utils/errorCodes.h` (+9 -1) 📝 `client/core/utils/errorStrings.cpp` (+37 -1) 📝 `client/core/utils/selfhosted/scriptsRegistry.cpp` (+0 -1) 📝 `client/core/utils/selfhosted/scriptsRegistry.h` (+1 -2) 📝 `client/server_scripts/serverScripts.qrc` (+0 -1) 📝 `client/server_scripts/xray/configure_container.sh` (+52 -13) 📝 `client/server_scripts/xray/run_container.sh` (+1 -0) _...and 15 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-14 21:07:09 +00:00

closed this issue
added the
pull-request
label

No labels

pull-request

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

amnezia-vpn/amnezia-client#3050

No description provided.

Rows
Columns