MinMaxRowType clamping + DropDownType fit-content drawer

client/core/configurators/xrayConfigurator.cpp

@@ -244,11 +244,7 @@ ErrorCode XrayConfigurator::applyServerSettingsToRemote(const ServerCredentials
                     << "container=" << static_cast<int>(container) << "host=" << credentials.hostName
                     << "transport=" << srv.transport << "security=" << srv.security << "port=" << srv.port
                     << "appendClient=" << appendNewClient;
-    QString flowValue = srv.flow;
-    if (flowValue.isEmpty() && srv.security == QLatin1String("reality")) {
-        flowValue = QStringLiteral("xtls-rprx-vision");
-    }
-
+    const QString flowValue = srv.flow;
     QString realityPublicKey;
     QString realityShortId;
     if (srv.security == QLatin1String("reality")) {
@@ -563,9 +559,12 @@ QJsonObject XrayConfigurator::buildStreamSettings(const XrayServerConfig &srv, c
         if (pad.obfsMode) {
             if (!pad.bytesMin.isEmpty() || !pad.bytesMax.isEmpty()) {
                 QJsonObject br;
-                br[QStringLiteral("from")] = pad.bytesMin.isEmpty() ? 1 : pad.bytesMin.toInt();
-                br[QStringLiteral("to")] = pad.bytesMax.isEmpty() ? (pad.bytesMin.isEmpty() ? 256 : pad.bytesMin.toInt())
-                                                                  : pad.bytesMax.toInt();
+                const int fromV = pad.bytesMin.isEmpty() ? 1 : pad.bytesMin.toInt();
+                int toV = pad.bytesMax.isEmpty() ? 256 : pad.bytesMax.toInt();
+                if (toV < fromV)
+                    toV = fromV;
+                br[QStringLiteral("from")] = fromV;
+                br[QStringLiteral("to")] = toV;
                 xo[QStringLiteral("xPaddingBytes")] = br;
             }
             xo[QStringLiteral("xPaddingKey")] = pad.key.isEmpty() ? QStringLiteral("x_padding") : pad.key;

client/core/models/protocols/xrayProtocolConfig.cpp

@@ -32,7 +32,7 @@ XrayXPaddingConfig XrayXPaddingConfig::fromJson(const QJsonObject &json)
     c.bytesMin  = json.value(configKey::xPaddingBytesMin).toString();
     c.bytesMax  = json.value(configKey::xPaddingBytesMax).toString();
     c.obfsMode  = json.value(configKey::xPaddingObfsMode).toBool(true);
-    c.key       = json.value(configKey::xPaddingKey).toString(protocols::xray::defaultSite);
+    c.key       = json.value(configKey::xPaddingKey).toString();
     c.header    = json.value(configKey::xPaddingHeader).toString();
     c.placement = json.value(configKey::xPaddingPlacement).toString(protocols::xray::defaultXPaddingPlacement);
     c.method    = json.value(configKey::xPaddingMethod).toString(protocols::xray::defaultXPaddingMethod);
@@ -365,6 +365,8 @@ XrayServerConfig XrayServerConfig::fromJson(const QJsonObject &json)
 bool XrayServerConfig::hasEqualServerSettings(const XrayServerConfig &other) const
 {
     return port == other.port
+           && transportProto == other.transportProto
+           && subnetAddress == other.subnetAddress
            && site == other.site
            && security == other.security
            && flow == other.flow

client/ui/models/protocols/xrayConfigModel.cpp

@@ -4,6 +4,10 @@
 #include "core/protocols/protocolUtils.h"
 #include "core/utils/constants/configKeys.h"
 #include "core/utils/constants/protocolConstants.h"
+#include "core/utils/networkUtilities.h"
+
+#include <QHostAddress>
+#include <QRegularExpression>
 
 using namespace amnezia;
 using namespace ProtocolUtils;
@@ -272,7 +276,7 @@ void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amne
     }
 
     if (!m_protocolConfig.serverConfig.isThirdPartyConfig) {
-        applyDefaultsToServerConfig(m_protocolConfig.serverConfig);
+        applyDefaultsToServerConfig(m_protocolConfig.serverConfig, false);
     }
 
     m_originalProtocolConfig = m_protocolConfig;
@@ -283,7 +287,7 @@ void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amne
     }
 }
 
-void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &config)
+void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &config, bool fillFlowDefault)
 {
     if (config.port.isEmpty()) {
         config.port = protocols::xray::defaultPort;
@@ -306,7 +310,7 @@ void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &con
         config.security = protocols::xray::defaultSecurity;
     }
 
-    if (config.flow.isEmpty()) {
+    if (fillFlowDefault && config.flow.isEmpty()) {
         config.flow = protocols::xray::defaultFlow;
     }
 
@@ -585,3 +589,87 @@ QString XrayConfigModel::mkcpDefaultWriteBufferSize()
 {
     return QString::fromLatin1(protocols::xray::defaultMkcpWriteBufferSize);
 }
+
+namespace {
+    bool isValidSingleHost(const QString &t)
+    {
+        if (t.isEmpty() || t.length() > 253) {
+            return false;
+        }
+        QHostAddress a(t);
+        if (a.protocol() == QHostAddress::IPv4Protocol) {
+            return NetworkUtilities::checkIPv4Format(t);
+        }
+        if (a.protocol() == QHostAddress::IPv6Protocol) {
+            return true;
+        }
+        static const QRegularExpression onlyDigits(QStringLiteral(R"(^\d+$)"));
+        if (onlyDigits.match(t).hasMatch()) {
+            return false;
+        }
+        QRegExp re = NetworkUtilities::domainRegExp();
+        re.setCaseSensitivity(Qt::CaseInsensitive);
+        return re.exactMatch(t);
+    }
+}
+
+bool XrayConfigModel::isValidHost(const QString &host)
+{
+    const QString t = host.trimmed();
+    if (t.isEmpty()) {
+        return true;
+    }
+    return isValidSingleHost(t);
+}
+
+bool XrayConfigModel::isValidSni(const QString &sni)
+{
+    const QString t = sni.trimmed();
+    if (t.isEmpty()) {
+        return true;
+    }
+    if (t.startsWith(QLatin1String("*."))) {
+        return isValidSingleHost(t.mid(2));
+    }
+    return isValidSingleHost(t);
+}
+
+bool XrayConfigModel::isValidPath(const QString &path)
+{
+    const QString t = path.trimmed();
+    if (t.isEmpty()) {
+        return true;
+    }
+    return t.startsWith(QLatin1Char('/'));
+}
+
+QStringList XrayConfigModel::validationErrors() const
+{
+    QStringList errs;
+    const auto &srv = m_protocolConfig.serverConfig;
+
+    if (!srv.port.isEmpty()) {
+        bool ok = false;
+        const int p = srv.port.toInt(&ok);
+        if (!ok || p < 1 || p > 65535) {
+            errs << tr("Port must be in the range of 1 to 65535");
+        }
+    }
+
+    if (srv.security == QLatin1String("tls") || srv.security == QLatin1String("reality")) {
+        if (!isValidSni(srv.sni)) {
+            errs << tr("SNI: enter a valid IP address or domain name");
+        }
+    }
+
+    if (srv.transport == QLatin1String("xhttp")) {
+        if (!isValidHost(srv.xhttp.host)) {
+            errs << tr("Host: enter a valid IP address or domain name");
+        }
+        if (!isValidPath(srv.xhttp.path)) {
+            errs << tr("Path must start with \"/\"");
+        }
+    }
+
+    return errs;
+}

client/ui/models/protocols/xrayConfigModel.h

@@ -118,6 +118,11 @@ public:
     Q_INVOKABLE static QString mkcpDefaultReadBufferSize();
     Q_INVOKABLE static QString mkcpDefaultWriteBufferSize();
 
+    Q_INVOKABLE static bool isValidHost(const QString &host);
+    Q_INVOKABLE static bool isValidSni(const QString &sni);
+    Q_INVOKABLE static bool isValidPath(const QString &path);
+    Q_INVOKABLE QStringList validationErrors() const;
+
 public slots:
     void updateModel(amnezia::DockerContainer container, const amnezia::XrayProtocolConfig& protocolConfig);
     amnezia::XrayProtocolConfig getProtocolConfig();
@@ -137,7 +142,7 @@ private:
     amnezia::XrayProtocolConfig m_protocolConfig;
     amnezia::XrayProtocolConfig m_originalProtocolConfig;
 
-    void applyDefaultsToServerConfig(amnezia::XrayServerConfig& config);
+    void applyDefaultsToServerConfig(amnezia::XrayServerConfig& config, bool fillFlowDefault = true);
 };
 
 #endif // XRAYCONFIGMODEL_H

client/ui/qml/Controls2/DropDownType.qml

@@ -42,6 +42,7 @@ Item {
     property int rootButtonTextBottomMargin: 16
 
     property real drawerHeight: 0.9
+    property bool fitContent: false
     property Item drawerParent
     property Component listView
 
@@ -219,12 +220,20 @@ Item {
         parent: drawerParent
 
         anchors.fill: parent
-        expandedHeight: drawerParent.height * drawerHeight
+        property real measuredContentHeight: 0
+        expandedHeight: (root.fitContent && measuredContentHeight > 0)
+            ? Math.min(measuredContentHeight, drawerParent.height * root.drawerHeight)
+            : drawerParent.height * root.drawerHeight
 
         expandedStateContent: Item {
             id: container
             implicitHeight: menu.expandedHeight
 
+            property real fitHeight: backButton.implicitHeight + titleLabel.implicitHeight
+                                     + (listViewLoader.item ? listViewLoader.item.contentHeight : 0) + 48
+            onFitHeightChanged: menu.measuredContentHeight = fitHeight
+            Component.onCompleted: menu.measuredContentHeight = fitHeight
+
             ColumnLayout {
                 id: header
 
@@ -238,6 +247,7 @@ Item {
                 }
 
                 Header2Type {
+                    id: titleLabel
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
                     Layout.bottomMargin: 16

client/ui/qml/Controls2/MinMaxRowType.qml

@@ -12,8 +12,8 @@ import "../Controls2/TextTypes"
 //   MinMaxRowType {
 //       minValue: "0"
 //       maxValue: "0"
-//       onMinChanged: someProperty = val
-//       onMaxChanged: someProperty = val
+//       onMinChanged: function(val) { someProperty = val }
+//       onMaxChanged: function(val) { someProperty = val }
 //   }
 Item {
     id: root
@@ -21,41 +21,128 @@ Item {
     property string minValue: "0"
     property string maxValue: "0"
 
+    property int minLimit: 0
+    property int maxLimit: 2147483647
+
+    property string hintText: root.minLimit > 0
+                              ? (root.minLimit + "–" + root.maxLimit)
+                              : ("≤ " + root.maxLimit)
+
     signal minChanged(string val)
     signal maxChanged(string val)
+    signal edited()
 
-    implicitHeight: row.implicitHeight
-    implicitWidth: row.implicitWidth
+    implicitHeight: col.implicitHeight
+    implicitWidth: col.implicitWidth
 
-    RowLayout {
-        id: row
+    function clampValue(text) {
+        if (text === "")
+            return ""
+        var n = parseInt(text, 10)
+        if (isNaN(n))
+            return ""
+        if (n < root.minLimit)
+            n = root.minLimit
+        if (n > root.maxLimit)
+            n = root.maxLimit
+        return String(n)
+    }
+
+    function capEdit(tf, holder) {
+        if (tf.text !== "" && parseInt(tf.text, 10) > root.maxLimit) {
+            tf.text = holder.lastValid
+            tf.cursorPosition = tf.text.length
+        } else {
+            holder.lastValid = tf.text
+        }
+    }
+
+    ColumnLayout {
+        id: col
         anchors.fill: parent
-        spacing: 10
+        spacing: 4
 
-        // Min field
-        TextFieldWithHeaderType {
+        RowLayout {
+            id: row
             Layout.fillWidth: true
-            headerText: qsTr("Min")
-            textField.text: root.minValue
-            textField.validator: IntValidator { bottom: 0 }
-            textField.onEditingFinished: {
-                if (textField.text !== root.minValue) {
-                    root.minChanged(textField.text)
+            spacing: 10
+
+            // Min field
+            TextFieldWithHeaderType {
+                id: minField
+                property string lastValid: ""
+                Layout.fillWidth: true
+                headerText: qsTr("Min")
+                textField.maximumLength: 10
+                textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                textField.onActiveFocusChanged: {
+                    if (minField.textField.activeFocus)
+                        minField.lastValid = minField.textField.text
+                }
+                textField.onTextEdited: { root.capEdit(minField.textField, minField); root.edited() }
+                textField.onEditingFinished: {
+                    var v = root.clampValue(minField.textField.text)
+                    if (v !== "" && root.maxValue !== "") {
+                        var mx = parseInt(root.maxValue, 10)
+                        if (!isNaN(mx) && parseInt(v, 10) > mx)
+                            root.maxChanged(v)
+                    }
+                    if (v !== root.minValue)
+                        root.minChanged(v)
+                    else if (minField.textField.text !== v)
+                        minField.textField.text = v
+                }
+
+                Binding {
+                    target: minField.textField
+                    property: "text"
+                    value: root.minValue
+                    when: !minField.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
+                }
+            }
+
+            // Max field
+            TextFieldWithHeaderType {
+                id: maxField
+                property string lastValid: ""
+                Layout.fillWidth: true
+                headerText: qsTr("Max")
+                textField.maximumLength: 10
+                textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                textField.onActiveFocusChanged: {
+                    if (maxField.textField.activeFocus)
+                        maxField.lastValid = maxField.textField.text
+                }
+                textField.onTextEdited: { root.capEdit(maxField.textField, maxField); root.edited() }
+                textField.onEditingFinished: {
+                    var v = root.clampValue(maxField.textField.text)
+                    if (v !== "" && root.minValue !== "") {
+                        var mn = parseInt(root.minValue, 10)
+                        if (!isNaN(mn) && parseInt(v, 10) < mn)
+                            v = String(mn)
+                    }
+                    if (v !== root.maxValue)
+                        root.maxChanged(v)
+                    else if (maxField.textField.text !== v)
+                        maxField.textField.text = v
+                }
+
+                Binding {
+                    target: maxField.textField
+                    property: "text"
+                    value: root.maxValue
+                    when: !maxField.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
                 }
             }
         }
 
-        // Max field
-        TextFieldWithHeaderType {
+        SmallTextType {
+            visible: root.hintText !== ""
+            text: root.hintText
+            color: AmneziaStyle.color.mutedGray
             Layout.fillWidth: true
-            headerText: qsTr("Max")
-            textField.text: root.maxValue
-            textField.validator: IntValidator { bottom: 0 }
-            textField.onEditingFinished: {
-                if (textField.text !== root.maxValue) {
-                    root.maxChanged(textField.text)
-                }
-            }
         }
     }
 }

client/ui/qml/Pages2/PageProtocolXraySecuritySettings.qml

@@ -15,6 +15,8 @@ import "../Components"
 PageType {
     id: root
 
+    property bool editDirty: false
+
     BackButtonType {
         id: backButton
         anchors.top: parent.top
@@ -90,6 +92,7 @@ PageType {
 
                 DropDownType {
                     id: tlsAlpnDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 16
                     Layout.leftMargin: 16
@@ -133,6 +136,7 @@ PageType {
 
                 DropDownType {
                     id: tlsFingerprintDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -175,14 +179,21 @@ PageType {
                 }
 
                 TextFieldWithHeaderType {
+                    id: sniFieldTls
                     Layout.fillWidth: true
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("Server Name (SNI)")
                     textField.text: sni
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9.*_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== sni)
                     textField.onEditingFinished: {
-                        if (textField.text !== sni) sni = textField.text
+                        var v = textField.text.trim()
+                        if (v !== sni) sni = v
+                        else if (textField.text !== v) textField.text = v
+                        sniFieldTls.errorText = XrayConfigModel.isValidSni(v) ? "" : qsTr("Enter a valid IP address or domain name")
+                        root.editDirty = false
                     }
                 }
             }
@@ -195,6 +206,7 @@ PageType {
 
                 DropDownType {
                     id: realityFingerprintDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 16
                     Layout.leftMargin: 16
@@ -237,14 +249,21 @@ PageType {
                 }
 
                 TextFieldWithHeaderType {
+                    id: sniFieldReality
                     Layout.fillWidth: true
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("Server Name (SNI)")
                     textField.text: sni
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9.*_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== sni)
                     textField.onEditingFinished: {
-                        if (textField.text !== sni) sni = textField.text
+                        var v = textField.text.trim()
+                        if (v !== sni) sni = v
+                        else if (textField.text !== v) textField.text = v
+                        sniFieldReality.errorText = XrayConfigModel.isValidSni(v) ? "" : qsTr("Enter a valid IP address or domain name")
+                        root.editDirty = false
                     }
                 }
             }
@@ -265,10 +284,15 @@ PageType {
         anchors.rightMargin: 16
         anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin
 
-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
         enabled: visible
         text: qsTr("Save")
         clickedFunc: function () {
+            var errs = XrayConfigModel.validationErrors()
+            if (errs.length > 0) {
+                PageController.showErrorMessage(errs.join("\n"))
+                return
+            }
             var headerText = qsTr("Save settings?")
             var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
             var yesButtonText = qsTr("Continue")

client/ui/qml/Pages2/PageProtocolXraySettings.qml

@@ -109,6 +109,7 @@ PageType {
                 Layout.rightMargin: 16
                 enabled: listView.enabled
                 headerText: qsTr("Port")
+                subtitleText: qsTr("1–65535")
 
                 Binding {
                     target: textFieldWithHeaderType.textField
@@ -119,8 +120,8 @@ PageType {
                 }
 
                 textField.maximumLength: 5
-                textField.validator: IntValidator {
-                    bottom: 1; top: 65535
+                textField.validator: RegularExpressionValidator {
+                    regularExpression: /^(|\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/
                 }
                 textField.onActiveFocusChanged: {
                     if (textField.activeFocus && textField.text === "" && port !== "") {
@@ -131,9 +132,19 @@ PageType {
                     root.portDirty = (textField.text !== port)
                 }
                 textField.onEditingFinished: {
-                    if (textField.text !== port) {
-                        port = textField.text
+                    var v = textFieldWithHeaderType.textField.text
+                    if (v !== "") {
+                        var n = parseInt(v, 10)
+                        if (isNaN(n) || n < 1)
+                            n = 1
+                        if (n > 65535)
+                            n = 65535
+                        v = String(n)
+                        if (textFieldWithHeaderType.textField.text !== v)
+                            textFieldWithHeaderType.textField.text = v
                     }
+                    if (v !== port)
+                        port = v
                     root.portDirty = false
                 }
                 checkEmptyText: true
@@ -198,6 +209,11 @@ PageType {
                 text: qsTr("Save")
                 onClicked: function() {
                     forceActiveFocus()
+                    var errs = XrayConfigModel.validationErrors()
+                    if (errs.length > 0) {
+                        PageController.showErrorMessage(errs.join("\n"))
+                        return
+                    }
                     var headerText = qsTr("Save settings?")
                     var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
                     var yesButtonText = qsTr("Continue")

client/ui/qml/Pages2/PageProtocolXrayTransportSettings.qml

@@ -15,6 +15,21 @@ import "../Components"
 PageType {
     id: root
 
+    property bool editDirty: false
+
+    function clampInt(text, lo, hi) {
+        if (text === "")
+            return ""
+        var n = parseInt(text, 10)
+        if (isNaN(n))
+            return ""
+        if (n < lo)
+            n = lo
+        if (n > hi)
+            n = hi
+        return String(n)
+    }
+
     BackButtonType {
         id: backButton
         anchors.top: parent.top
@@ -108,10 +123,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("TTI")
-                    subtitleText: qsTr("Default: %1 ms", "mKCP TTI").arg(XrayConfigModel.mkcpDefaultTti())
+                    subtitleText: qsTr("Range 10–100, default %1 ms", "mKCP TTI").arg(XrayConfigModel.mkcpDefaultTti())
                     textField.text: mkcpTti
+                    textField.maximumLength: 3
+                    textField.validator: RegularExpressionValidator { regularExpression: /^(|\d{1,2}|100)$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpTti)
                     textField.onEditingFinished: {
-                        if (textField.text !== mkcpTti) mkcpTti = textField.text
+                        var v = root.clampInt(textField.text, 10, 100)
+                        if (v !== mkcpTti) mkcpTti = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -121,10 +142,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("uplinkCapacity")
-                    subtitleText: qsTr("Default: %1 Mbit/s", "mKCP uplink").arg(XrayConfigModel.mkcpDefaultUplinkCapacity())
+                    subtitleText: qsTr("≥ 0, default %1 MB/s", "mKCP uplink").arg(XrayConfigModel.mkcpDefaultUplinkCapacity())
                     textField.text: mkcpUplinkCapacity
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpUplinkCapacity)
                     textField.onEditingFinished: {
-                        if (textField.text !== mkcpUplinkCapacity) mkcpUplinkCapacity = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== mkcpUplinkCapacity) mkcpUplinkCapacity = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -134,10 +161,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("downlinkCapacity")
-                    subtitleText: qsTr("Default: %1 Mbit/s", "mKCP downlink").arg(XrayConfigModel.mkcpDefaultDownlinkCapacity())
+                    subtitleText: qsTr("≥ 0, default %1 MB/s", "mKCP downlink").arg(XrayConfigModel.mkcpDefaultDownlinkCapacity())
                     textField.text: mkcpDownlinkCapacity
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpDownlinkCapacity)
                     textField.onEditingFinished: {
-                        if (textField.text !== mkcpDownlinkCapacity) mkcpDownlinkCapacity = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== mkcpDownlinkCapacity) mkcpDownlinkCapacity = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -147,10 +180,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("readBufferSize")
-                    subtitleText: qsTr("Default: %1 MiB").arg(XrayConfigModel.mkcpDefaultReadBufferSize())
+                    subtitleText: qsTr("≥ 1, default %1 MB").arg(XrayConfigModel.mkcpDefaultReadBufferSize())
                     textField.text: mkcpReadBufferSize
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpReadBufferSize)
                     textField.onEditingFinished: {
-                        if (textField.text !== mkcpReadBufferSize) mkcpReadBufferSize = textField.text
+                        var v = root.clampInt(textField.text, 1, 2147483647)
+                        if (v !== mkcpReadBufferSize) mkcpReadBufferSize = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -160,10 +199,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("writeBufferSize")
-                    subtitleText: qsTr("Default: %1 MiB").arg(XrayConfigModel.mkcpDefaultWriteBufferSize())
+                    subtitleText: qsTr("≥ 1, default %1 MB").arg(XrayConfigModel.mkcpDefaultWriteBufferSize())
                     textField.text: mkcpWriteBufferSize
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== mkcpWriteBufferSize)
                     textField.onEditingFinished: {
-                        if (textField.text !== mkcpWriteBufferSize) mkcpWriteBufferSize = textField.text
+                        var v = root.clampInt(textField.text, 1, 2147483647)
+                        if (v !== mkcpWriteBufferSize) mkcpWriteBufferSize = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -187,6 +232,7 @@ PageType {
 
                 DropDownType {
                     id: modeDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 16
                     Layout.leftMargin: 16
@@ -239,31 +285,46 @@ PageType {
                 }
 
                 TextFieldWithHeaderType {
+                    id: hostField
                     Layout.fillWidth: true
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("Host")
                     textField.text: xhttpHost
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9._:,-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpHost)
                     textField.onEditingFinished: {
-                        if (textField.text !== xhttpHost) xhttpHost = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpHost) xhttpHost = v
+                        else if (textField.text !== v) textField.text = v
+                        hostField.errorText = XrayConfigModel.isValidHost(v) ? "" : qsTr("Enter a valid IP address or domain name")
+                        root.editDirty = false
                     }
                 }
 
                 TextFieldWithHeaderType {
+                    id: pathField
                     Layout.fillWidth: true
                     Layout.leftMargin: 16
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("Path")
                     textField.text: xhttpPath
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9\-._~:\/?#\[\]@!$&'()*+,;=%]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpPath)
                     textField.onEditingFinished: {
-                        if (textField.text !== xhttpPath) xhttpPath = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpPath) xhttpPath = v
+                        else if (textField.text !== v) textField.text = v
+                        pathField.errorText = XrayConfigModel.isValidPath(v) ? "" : qsTr("Path must start with \"/\"")
+                        root.editDirty = false
                     }
                 }
 
                 DropDownType {
                     id: headersDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -307,6 +368,7 @@ PageType {
 
                 DropDownType {
                     id: uplinkMethodDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -386,6 +448,7 @@ PageType {
 
                 DropDownType {
                     id: sessionPlacementDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -429,6 +492,7 @@ PageType {
 
                 DropDownType {
                     id: sessionKeyDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -472,6 +536,7 @@ PageType {
 
                 DropDownType {
                     id: seqPlacementDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -520,13 +585,19 @@ PageType {
                     Layout.topMargin: 8
                     headerText: qsTr("SeqKey")
                     textField.text: xhttpSeqKey
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpSeqKey)
                     textField.onEditingFinished: {
-                        if (textField.text !== xhttpSeqKey) xhttpSeqKey = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpSeqKey) xhttpSeqKey = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
                 DropDownType {
                     id: uplinkDataPlacementDropDown
+                    fitContent: true
                     Layout.fillWidth: true
                     Layout.topMargin: 8
                     Layout.leftMargin: 16
@@ -575,8 +646,13 @@ PageType {
                     Layout.topMargin: 8
                     headerText: qsTr("UplinkDataKey")
                     textField.text: xhttpUplinkDataKey
+                    textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpUplinkDataKey)
                     textField.onEditingFinished: {
-                        if (textField.text !== xhttpUplinkDataKey) xhttpUplinkDataKey = textField.text
+                        var v = textField.text.trim()
+                        if (v !== xhttpUplinkDataKey) xhttpUplinkDataKey = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -597,12 +673,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("UplinkChunkSize")
+                    subtitleText: qsTr("≥ 0 (0 = off)")
                     textField.text: xhttpUplinkChunkSize
-                    textField.validator: IntValidator {
-                        bottom: 0
-                    }
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpUplinkChunkSize)
                     textField.onEditingFinished: {
-                        if (textField.text !== xhttpUplinkChunkSize) xhttpUplinkChunkSize = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== xhttpUplinkChunkSize) xhttpUplinkChunkSize = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -612,9 +692,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 8
                     headerText: qsTr("scMaxBufferedPosts")
+                    subtitleText: qsTr("≥ 0")
                     textField.text: xhttpScMaxBufferedPosts
+                    textField.maximumLength: 10
+                    textField.validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xhttpScMaxBufferedPosts)
                     textField.onEditingFinished: {
-                        if (textField.text !== xhttpScMaxBufferedPosts) xhttpScMaxBufferedPosts = textField.text
+                        var v = root.clampInt(textField.text, 0, 2147483647)
+                        if (v !== xhttpScMaxBufferedPosts) xhttpScMaxBufferedPosts = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
 
@@ -633,8 +720,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xhttpScMaxEachPostBytesMin
                     maxValue: xhttpScMaxEachPostBytesMax
-                    onMinChanged: xhttpScMaxEachPostBytesMin = val
-                    onMaxChanged: xhttpScMaxEachPostBytesMax = val
+                    onMinChanged: function(val) { xhttpScMaxEachPostBytesMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xhttpScMaxEachPostBytesMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 CaptionTextType {
@@ -652,8 +740,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xhttpScStreamUpServerSecsMin
                     maxValue: xhttpScStreamUpServerSecsMax
-                    onMinChanged: xhttpScStreamUpServerSecsMin = val
-                    onMaxChanged: xhttpScStreamUpServerSecsMax = val
+                    onMinChanged: function(val) { xhttpScStreamUpServerSecsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xhttpScStreamUpServerSecsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 CaptionTextType {
@@ -671,8 +760,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xhttpScMinPostsIntervalMsMin
                     maxValue: xhttpScMinPostsIntervalMsMax
-                    onMinChanged: xhttpScMinPostsIntervalMsMin = val
-                    onMaxChanged: xhttpScMinPostsIntervalMsMax = val
+                    onMinChanged: function(val) { xhttpScMinPostsIntervalMsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xhttpScMinPostsIntervalMsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 // ── Padding and multiplexing ──────────────────────────
@@ -728,10 +818,15 @@ PageType {
         anchors.rightMargin: 16
         anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin
 
-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
         enabled: visible
         text: qsTr("Save")
         clickedFunc: function () {
+            var errs = XrayConfigModel.validationErrors()
+            if (errs.length > 0) {
+                PageController.showErrorMessage(errs.join("\n"))
+                return
+            }
             var headerText = qsTr("Save settings?")
             var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
             var yesButtonText = qsTr("Continue")

client/ui/qml/Pages2/PageProtocolXrayXPaddingBytesSettings.qml

@@ -15,6 +15,8 @@ import "../Components"
 PageType {
     id: root
 
+    property bool editDirty: false
+
     BackButtonType {
         id: backButton
         anchors.top: parent.top
@@ -61,8 +63,9 @@ PageType {
                 Layout.rightMargin: 16
                 minValue: xPaddingBytesMin
                 maxValue: xPaddingBytesMax
-                onMinChanged: xPaddingBytesMin = val
-                onMaxChanged: xPaddingBytesMax = val
+                onMinChanged: function(val) { xPaddingBytesMin = val; root.editDirty = false }
+                onMaxChanged: function(val) { xPaddingBytesMax = val; root.editDirty = false }
+                onEdited: root.editDirty = true
             }
 
             Item {
@@ -81,7 +84,7 @@ PageType {
         anchors.rightMargin: 16
         anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin
 
-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
         enabled: visible
         text: qsTr("Save")
         clickedFunc: function () {

client/ui/qml/Pages2/PageProtocolXrayXPaddingSettings.qml

@@ -15,6 +15,8 @@ import "../Components"
 PageType {
     id: root
 
+    property bool editDirty: false
+
     BackButtonType {
         id: backButton
         anchors.top: parent.top
@@ -78,8 +80,13 @@ PageType {
                 Layout.topMargin: 16
                 headerText: qsTr("xPaddingKey")
                 textField.text: xPaddingKey
+                textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                textField.onTextEdited: root.editDirty = (textField.text !== xPaddingKey)
                 textField.onEditingFinished: {
-                    if (textField.text !== xPaddingKey) xPaddingKey = textField.text
+                    var v = textField.text.trim()
+                    if (v !== xPaddingKey) xPaddingKey = v
+                    else if (textField.text !== v) textField.text = v
+                    root.editDirty = false
                 }
             }
 
@@ -90,13 +97,19 @@ PageType {
                 Layout.topMargin: 8
                 headerText: qsTr("xPaddingHeader")
                 textField.text: xPaddingHeader
+                textField.validator: RegularExpressionValidator { regularExpression: /^[A-Za-z0-9_-]*$/ }
+                textField.onTextEdited: root.editDirty = (textField.text !== xPaddingHeader)
                 textField.onEditingFinished: {
-                    if (textField.text !== xPaddingHeader) xPaddingHeader = textField.text
+                    var v = textField.text.trim()
+                    if (v !== xPaddingHeader) xPaddingHeader = v
+                    else if (textField.text !== v) textField.text = v
+                    root.editDirty = false
                 }
             }
 
             DropDownType {
                 id: placementDropDown
+                fitContent: true
                 Layout.fillWidth: true
                 Layout.topMargin: 8
                 Layout.leftMargin: 16
@@ -140,6 +153,7 @@ PageType {
 
             DropDownType {
                 id: methodDropDown
+                fitContent: true
                 Layout.fillWidth: true
                 Layout.topMargin: 8
                 Layout.leftMargin: 16
@@ -197,7 +211,7 @@ PageType {
         anchors.rightMargin: 16
         anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin
 
-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
         enabled: visible
         text: qsTr("Save")
         clickedFunc: function () {

client/ui/qml/Pages2/PageProtocolXrayXmuxSettings.qml

@@ -15,6 +15,21 @@ import "../Components"
 PageType {
     id: root
 
+    property bool editDirty: false
+
+    function clampSigned(text) {
+        if (text === "" || text === "-")
+            return ""
+        var n = parseInt(text, 10)
+        if (isNaN(n))
+            return ""
+        if (n > 2147483647)
+            n = 2147483647
+        if (n < -2147483648)
+            n = -2147483648
+        return String(n)
+    }
+
     BackButtonType {
         id: backButton
         anchors.top: parent.top
@@ -78,8 +93,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xmuxMaxConcurrencyMin
                     maxValue: xmuxMaxConcurrencyMax
-                    onMinChanged: xmuxMaxConcurrencyMin = val
-                    onMaxChanged: xmuxMaxConcurrencyMax = val
+                    onMinChanged: function(val) { xmuxMaxConcurrencyMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxMaxConcurrencyMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 // maxConnections
@@ -98,8 +114,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xmuxMaxConnectionsMin
                     maxValue: xmuxMaxConnectionsMax
-                    onMinChanged: xmuxMaxConnectionsMin = val
-                    onMaxChanged: xmuxMaxConnectionsMax = val
+                    onMinChanged: function(val) { xmuxMaxConnectionsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxMaxConnectionsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 // cMaxReuseTimes
@@ -118,8 +135,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xmuxCMaxReuseTimesMin
                     maxValue: xmuxCMaxReuseTimesMax
-                    onMinChanged: xmuxCMaxReuseTimesMin = val
-                    onMaxChanged: xmuxCMaxReuseTimesMax = val
+                    onMinChanged: function(val) { xmuxCMaxReuseTimesMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxCMaxReuseTimesMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 // hMaxRequestTimes
@@ -138,8 +156,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xmuxHMaxRequestTimesMin
                     maxValue: xmuxHMaxRequestTimesMax
-                    onMinChanged: xmuxHMaxRequestTimesMin = val
-                    onMaxChanged: xmuxHMaxRequestTimesMax = val
+                    onMinChanged: function(val) { xmuxHMaxRequestTimesMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxHMaxRequestTimesMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 // hMaxReusableSecs
@@ -158,8 +177,9 @@ PageType {
                     Layout.rightMargin: 16
                     minValue: xmuxHMaxReusableSecsMin
                     maxValue: xmuxHMaxReusableSecsMax
-                    onMinChanged: xmuxHMaxReusableSecsMin = val
-                    onMaxChanged: xmuxHMaxReusableSecsMax = val
+                    onMinChanged: function(val) { xmuxHMaxReusableSecsMin = val; root.editDirty = false }
+                    onMaxChanged: function(val) { xmuxHMaxReusableSecsMax = val; root.editDirty = false }
+                    onEdited: root.editDirty = true
                 }
 
                 TextFieldWithHeaderType {
@@ -168,12 +188,16 @@ PageType {
                     Layout.rightMargin: 16
                     Layout.topMargin: 16
                     headerText: qsTr("hKeepAlivePeriod")
+                    subtitleText: qsTr("Integer, may be negative")
                     textField.text: xmuxHKeepAlivePeriod
-                    textField.validator: IntValidator {
-                        bottom: 0
-                    }
+                    textField.maximumLength: 11
+                    textField.validator: RegularExpressionValidator { regularExpression: /^-?\d*$/ }
+                    textField.onTextEdited: root.editDirty = (textField.text !== xmuxHKeepAlivePeriod)
                     textField.onEditingFinished: {
-                        if (textField.text !== xmuxHKeepAlivePeriod) xmuxHKeepAlivePeriod = textField.text
+                        var v = root.clampSigned(textField.text)
+                        if (v !== xmuxHKeepAlivePeriod) xmuxHKeepAlivePeriod = v
+                        else if (textField.text !== v) textField.text = v
+                        root.editDirty = false
                     }
                 }
             }
@@ -194,7 +218,7 @@ PageType {
         anchors.rightMargin: 16
         anchors.bottomMargin: 16 + PageController.safeAreaBottomMargin
 
-        visible: listView.enabled && XrayConfigModel.hasUnsavedChanges
+        visible: listView.enabled && (XrayConfigModel.hasUnsavedChanges || root.editDirty)
         enabled: visible
         text: qsTr("Save")
         clickedFunc: function () {