fixed changes

client/core/configurators/xrayConfigurator.cpp

@@ -1,29 +1,28 @@
 #include "xrayConfigurator.h"
 
-#include "logger.h"
 #include <QFile>
-#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QUuid>
+#include "logger.h"
 
-#include "core/models/containerConfig.h"
-#include "core/models/protocolConfig.h"
-#include "core/models/protocols/xrayProtocolConfig.h"
-#include "core/protocols/protocolUtils.h"
-#include "core/utils/constants/configKeys.h"
-#include "core/utils/constants/protocolConstants.h"
 #include "core/utils/containerEnum.h"
 #include "core/utils/containers/containerUtils.h"
 #include "core/utils/protocolEnum.h"
-#include "core/utils/selfhosted/scriptsRegistry.h"
 #include "core/utils/selfhosted/sshSession.h"
+#include "core/utils/selfhosted/scriptsRegistry.h"
+#include "core/utils/protocolEnum.h"
+#include "core/protocols/protocolUtils.h"
+#include "core/utils/constants/configKeys.h"
+#include "core/utils/constants/protocolConstants.h"
+#include "core/models/containerConfig.h"
+#include "core/models/protocols/xrayProtocolConfig.h"
 
-namespace
-{
+namespace {
     Logger logger("XrayConfigurator");
-    QString normalizeXhttpMode(const QString &m)
-    {
+
+    QString normalizeXhttpMode(const QString &m) {
         const QString t = m.trimmed();
         if (t.isEmpty() || t.compare(QLatin1String("Auto"), Qt::CaseInsensitive) == 0) {
             return QStringLiteral("auto");
@@ -436,6 +435,9 @@ ProtocolConfig XrayConfigurator::createConfig(const ServerCredentials &credentia
     QString xrayClientId = prepareServerConfig(credentials, container, containerConfig, dnsSettings, errorCode);
     if (errorCode != ErrorCode::NoError || xrayClientId.isEmpty()) {
         logger.error() << "Failed to prepare server config";
+        if (errorCode == ErrorCode::NoError) {
+            errorCode = ErrorCode::InternalError;
+        }
         return XrayProtocolConfig{};
     }
 
@@ -448,6 +450,9 @@ ProtocolConfig XrayConfigurator::createConfig(const ServerCredentials &credentia
                                                                amnezia::protocols::xray::PublicKeyPath, errorCode);
         if (errorCode != ErrorCode::NoError || xrayPublicKey.isEmpty()) {
             logger.error() << "Failed to get public key";
+            if (errorCode == ErrorCode::NoError) {
+                errorCode = ErrorCode::InternalError;
+            }
             return XrayProtocolConfig{};
         }
         xrayPublicKey.replace("\n", "");
@@ -456,6 +461,9 @@ ProtocolConfig XrayConfigurator::createConfig(const ServerCredentials &credentia
                                                              amnezia::protocols::xray::shortidPath, errorCode);
         if (errorCode != ErrorCode::NoError || xrayShortId.isEmpty()) {
             logger.error() << "Failed to get short ID";
+            if (errorCode == ErrorCode::NoError) {
+                errorCode = ErrorCode::InternalError;
+            }
             return XrayProtocolConfig{};
         }
         xrayShortId.replace("\n", "");

client/core/models/protocols/xrayProtocolConfig.cpp

@@ -170,21 +170,44 @@ QJsonObject XrayServerConfig::toJson() const
     QJsonObject obj;
 
     // Existing fields
-    if (!port.isEmpty())           obj[configKey::port]           = port;
-    if (!transportProto.isEmpty()) obj[configKey::transportProto] = transportProto;
-    if (!subnetAddress.isEmpty())  obj[configKey::subnetAddress]  = subnetAddress;
-    if (!site.isEmpty())           obj[configKey::site]           = site;
-    if (isThirdPartyConfig)        obj[configKey::isThirdPartyConfig] = isThirdPartyConfig;
+    if (!port.isEmpty()) {
+        obj[configKey::port] = port;
+    }
+    if (!transportProto.isEmpty()) {
+        obj[configKey::transportProto] = transportProto;
+    }
+    if (!subnetAddress.isEmpty()) {
+        obj[configKey::subnetAddress] = subnetAddress;
+    }
+    if (!site.isEmpty()) {
+        obj[configKey::site] = site;
+    }
+
+    if (isThirdPartyConfig) {
+        obj[configKey::isThirdPartyConfig] = isThirdPartyConfig;
+    }
 
     // New: Security
-    if (!security.isEmpty())    obj[configKey::xraySecurity]    = security;
-    if (!flow.isEmpty())        obj[configKey::xrayFlow]        = flow;
-    if (!fingerprint.isEmpty()) obj[configKey::xrayFingerprint] = fingerprint;
-    if (!sni.isEmpty())         obj[configKey::xraySni]         = sni;
-    if (!alpn.isEmpty())        obj[configKey::xrayAlpn]        = alpn;
+    if (!security.isEmpty()) {
+        obj[configKey::xraySecurity] = security;
+    }
+    if (!flow.isEmpty()) {
+        obj[configKey::xrayFlow] = flow;
+    }
+    if (!fingerprint.isEmpty()) {
+        obj[configKey::xrayFingerprint] = fingerprint;
+    }
+    if (!sni.isEmpty()) {
+        obj[configKey::xraySni] = sni;
+    }
+    if (!alpn.isEmpty()) {
+        obj[configKey::xrayAlpn] = alpn;
+    }
 
     // New: Transport
-    if (!transport.isEmpty()) obj[configKey::xrayTransport] = transport;
+    if (!transport.isEmpty()) {
+        obj[configKey::xrayTransport] = transport;
+    }
     obj["xhttp"] = xhttp.toJson();
     obj["mkcp"] = mkcp.toJson();
 

client/core/models/protocols/xrayProtocolConfig.h

@@ -93,7 +93,6 @@ struct XrayMkcpConfig {
 
 // ── Server config (settings editable by user) ─────────────────────────────────
 struct XrayServerConfig {
-    // Existing fields
     QString port;
     QString transportProto;
     QString subnetAddress;
@@ -113,6 +112,7 @@ struct XrayServerConfig {
     XrayMkcpConfig mkcp;
 
     QJsonObject toJson() const;
+
     static XrayServerConfig fromJson(const QJsonObject &json);
 
     bool hasEqualServerSettings(const XrayServerConfig &other) const;

client/ui/models/protocols/xrayConfigModel.cpp

@@ -167,8 +167,7 @@ bool XrayConfigModel::setData(const QModelIndex& index, const QVariant& value, i
 
 QVariant XrayConfigModel::data(const QModelIndex& index, int role) const
 {
-    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount())
-    {
+    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
         return QVariant();
     }
 
@@ -252,14 +251,18 @@ QVariant XrayConfigModel::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-void XrayConfigModel::updateModel(amnezia::DockerContainer container,
-                                  const amnezia::XrayProtocolConfig& protocolConfig)
+void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amnezia::XrayProtocolConfig& protocolConfig)
 {
     beginResetModel();
+
     m_container = container;
+
     m_protocolConfig = protocolConfig;
+
     applyDefaultsToServerConfig(m_protocolConfig.serverConfig);
+
     m_originalProtocolConfig = m_protocolConfig;
+
     endResetModel();
 }
 
@@ -269,6 +272,11 @@ void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &con
         config.port = protocols::xray::defaultPort;
     }
 
+    if (config.transportProto.isEmpty()) {
+        config.transportProto = ProtocolUtils::transportProtoToString(
+            ProtocolUtils::defaultTransportProto(amnezia::Proto::Xray), amnezia::Proto::Xray);
+    }
+
     if (config.site.isEmpty()) {
         config.site = protocols::xray::defaultSite;
     }

client/ui/qml/Pages2/PageProtocolXraySettings.qml

@@ -46,7 +46,7 @@ PageType {
         delegate: ColumnLayout {
             width: listView.width
 
-            property alias focusItemId: portTextField.textField
+            property alias focusItemId: textFieldWithHeaderType.textField
 
             spacing: 0
 
@@ -87,7 +87,7 @@ PageType {
             }
 
             TextFieldWithHeaderType {
-                id: portTextField
+                id: textFieldWithHeaderType
                 Layout.fillWidth: true
                 Layout.topMargin: 32
                 Layout.leftMargin: 16
@@ -158,7 +158,7 @@ PageType {
                 Layout.bottomMargin: 8
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
-                enabled: portTextField.errorText === ""
+                enabled: textFieldWithHeaderType.errorText === ""
                 text: qsTr("Save")
                 onClicked: function() {
                     forceActiveFocus()