move sudo docker volume rm -f

* test crash xray

* fixed save config xray

* reset file

* fixed text port & reset file

* fixed textFieldWithHeaderType.textField

.github/workflows/deploy.yml

@@ -88,7 +88,7 @@ jobs:
         host: 'linux'
         target: 'desktop'
         arch: 'linux_gcc_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools qthttpserver qtwebsockets'
+        modules: 'qtremoteobjects qt5compat qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -201,7 +201,7 @@ jobs:
         host: 'windows'
         target: 'desktop'
         arch: 'win64_msvc2022_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools qthttpserver qtwebsockets'
+        modules: 'qtremoteobjects qt5compat qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -365,7 +365,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'mac'
         target: 'desktop'
-        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia qthttpserver qtwebsockets'
+        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
         arch: 'clang_64'
         dir: ${{ runner.temp }}
         set-env: 'true'
@@ -377,7 +377,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'mac'
         target: 'ios'
-        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia qthttpserver qtwebsockets'
+        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'
@@ -506,7 +506,7 @@ jobs:
         host: 'mac'
         target: 'desktop'
         arch: 'clang_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools qthttpserver qtwebsockets'
+        modules: 'qtremoteobjects qt5compat qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'
@@ -739,7 +739,7 @@ jobs:
       ANDROID_PLATFORM: android-28
       NDK_VERSION: 27.0.11718014
       QT_VERSION: 6.10.3
-      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools qthttpserver qtwebsockets'
+      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
       PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
       PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
       FALLBACK_S3_ENDPOINT: ${{ secrets.FALLBACK_S3_ENDPOINT }}

.gitignore

@@ -10,9 +10,7 @@ deploy/build_64/*
 winbuild*.bat
 .cache/
 .vscode/
-.cursorignore
-.cursor/
-.venv/
+
 
 # Qt-es
 /.qmake.cache

client/CMakeLists.txt

@@ -14,10 +14,6 @@ set(PACKAGES
     Core5Compat Concurrent LinguistTools
 )
 
-if(NOT ANDROID AND NOT IOS)
-    list(APPEND PACKAGES HttpServer)
-endif()
-
 execute_process(
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
   COMMAND git rev-parse --short HEAD
@@ -51,10 +47,6 @@ set(LIBS ${LIBS}
     Qt6::Core5Compat Qt6::Concurrent
 )
 
-if(NOT ANDROID AND NOT IOS)
-    list(APPEND LIBS Qt6::HttpServer)
-endif()
-
 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
     set(LIBS ${LIBS} Qt6::Widgets)
 endif()

client/cmake/sources.cmake

@@ -201,11 +201,6 @@ file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/configurat
 file(GLOB_RECURSE CORE_MODELS_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/models/*.h)
 file(GLOB_RECURSE CORE_MODELS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/models/*.cpp)
 
-if(NOT ANDROID AND NOT IOS)
-    file(GLOB LOCAL_PROXY_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.h)
-    file(GLOB LOCAL_PROXY_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/core/local-proxy/*.cpp)
-endif()
-
 file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
     ${CLIENT_ROOT_DIR}/ui/models/*.h
     ${CLIENT_ROOT_DIR}/ui/models/protocols/*.h
@@ -251,11 +246,6 @@ set(SOURCES ${SOURCES}
     ${UI_CONTROLLERS_CPP}
 )
 
-if(NOT ANDROID AND NOT IOS)
-    list(APPEND HEADERS ${LOCAL_PROXY_H})
-    list(APPEND SOURCES ${LOCAL_PROXY_CPP})
-endif()
-
 if(WIN32)
     set(HEADERS ${HEADERS}
         ${CLIENT_ROOT_DIR}/core/protocols/ikev2VpnProtocolWindows.h

client/core/controllers/connectionController.cpp

@@ -140,13 +140,6 @@ ErrorCode ConnectionController::openConnection(const QString &serverId)
         return errorCode;
     }
 
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    if (m_appSettingsRepository && m_appSettingsRepository->isLocalProxyHttpEnabled()) {
-        m_appSettingsRepository->setLocalProxyHttpEnabled(false);
-        emit localProxyStoppedBecauseVpnTurnedOn(tr("Local proxy stopped because VPN was turned on"));
-    }
-#endif
-
     emit openConnectionRequested(serverId, container, vpnConfiguration);
     return ErrorCode::NoError;
 }

client/core/controllers/connectionController.h

@@ -67,7 +67,6 @@ signals:
     void closeConnectionRequested();
     void setConnectionStateRequested(Vpn::ConnectionState state);
     void killSwitchModeChangedRequested(bool enabled);
-    void localProxyStoppedBecauseVpnTurnedOn(const QString &message);
 
 #ifdef Q_OS_ANDROID
     void restoreConnectionRequested();

client/core/controllers/coreController.cpp

@@ -1,10 +1,7 @@
 #include "coreController.h"
 
-#include <QCoreApplication>
 #include <QDirIterator>
-#include <QDebug>
 #include <QTranslator>
-#include <QStandardPaths>
 #include <QTimer>
 
 #include "core/utils/selfhosted/sshSession.h"
@@ -38,10 +35,6 @@ CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnectio
     initAppleController();
     initLogging();
 
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    initLocalProxy();
-#endif
-
     m_translator = new QTranslator(this);
     if (m_appSettingsRepository) {
         updateTranslator(m_appSettingsRepository->getAppLanguage());
@@ -55,69 +48,6 @@ void CoreController::setQmlContextProperty(const QString &name, QObject *value)
     }
 }
 
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-void CoreController::initLocalProxy()
-{
-    constexpr quint16 kLocalProxyApiPort = 49490;
-
-    m_proxyServer.reset(new ProxyServer(m_serversRepository, m_appSettingsRepository, this));
-
-    QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, [this]() {
-        if (m_appSettingsRepository && m_appSettingsRepository->isLocalProxyHttpEnabled()) {
-            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
-        }
-    });
-
-    auto syncLocalProxy = [this]() {
-        if (!m_proxyServer) {
-            return;
-        }
-
-        const bool httpEnabled = m_appSettingsRepository->isLocalProxyHttpEnabled();
-
-        if (!httpEnabled) {
-            qInfo() << "Local proxy: HTTP API disabled";
-            m_proxyServer->stop();
-            return;
-        }
-
-        if (!m_proxyServer->start(kLocalProxyApiPort)) {
-            qWarning() << "Local proxy: failed to start on port" << kLocalProxyApiPort;
-            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
-            emit m_appSettingsRepository->localProxyStartFailed(tr("Local proxy failed to start. Check if the port is available."));
-            return;
-        }
-
-        if (!m_proxyServer->syncSettings()) {
-            qWarning() << "Local proxy: failed to start proxy core (Xray)";
-            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
-            emit m_appSettingsRepository->localProxyStartFailed(tr("Couldn’t start the proxy due to an internal error. Try restarting the app."));
-            return;
-        }
-
-        qInfo() << "Local proxy: running on 127.0.0.1:" << kLocalProxyApiPort;
-    };
-
-    syncLocalProxy();
-
-    connect(m_appSettingsRepository, &SecureAppSettingsRepository::localProxySettingsChanged, this, syncLocalProxy);
-
-    connect(m_serversRepository, &SecureServersRepository::serverEdited, this, [this](const QString &serverId) {
-        if (m_appSettingsRepository && m_appSettingsRepository->isLocalProxyHttpEnabled()
-            && m_appSettingsRepository->localProxyOwnerId() == serverId) {
-            m_appSettingsRepository->bumpLocalProxyRestartToken();
-        }
-    });
-
-    connect(m_serversRepository, &SecureServersRepository::serverRemoved, this, [this](const QString &serverId, int) {
-        if (m_appSettingsRepository && m_appSettingsRepository->localProxyOwnerId() == serverId) {
-            m_appSettingsRepository->setLocalProxyOwnerId(QString());
-            m_appSettingsRepository->setLocalProxyHttpEnabled(false);
-        }
-    });
-}
-#endif
-
 void CoreController::initModels()
 {
     m_containersModel = new ContainersModel(this);
@@ -267,11 +197,6 @@ void CoreController::initControllers()
     m_pageController = new PageController(m_serversController, m_settingsController, this);
     setQmlContextProperty("PageController", m_pageController);
 
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    connect(m_connectionController, &ConnectionController::localProxyStoppedBecauseVpnTurnedOn, m_pageController,
-            &PageController::showNotificationMessage);
-#endif
-
     m_serversUiController = new ServersUiController(m_serversController, m_settingsController, m_serversModel, m_containersModel, m_defaultServerContainersModel, this);
     setQmlContextProperty("ServersUiController", m_serversUiController);
 

client/core/controllers/coreController.h

@@ -78,7 +78,6 @@
 #include "ui/models/newsModel.h"
 
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    #include "core/local-proxy/proxyserver.h"
     #include "ui/utils/notificationHandler.h"
 #endif
 
@@ -143,9 +142,6 @@ private:
     void initAppleController();
     void initLogging();
     void initSignalHandlers();
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    void initLocalProxy();
-#endif
     void setQmlContextProperty(const QString &name, QObject *value);
 
     QQmlApplicationEngine *m_engine {}; // TODO use parent child system here?
@@ -231,10 +227,6 @@ private:
     TelemtConfigModel* m_telemtConfigModel;
 
     CoreSignalHandlers* m_signalHandlers;
-
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    QScopedPointer<ProxyServer> m_proxyServer;
-#endif
 };
 
 #endif // CORECONTROLLER_H

client/core/controllers/selfhosted/installController.cpp

@@ -72,6 +72,21 @@ namespace
         }
         return false;
     }
+
+    bool usesNamedDataVolume(DockerContainer container)
+    {
+        return container == DockerContainer::MtProxy || container == DockerContainer::Telemt;
+    }
+
+    QString buildRemoveContainerScript(const amnezia::ScriptVars &vars, bool removeDataVolume)
+    {
+        QString script = SshSession::replaceVars(amnezia::scriptData(SharedScriptType::remove_container), vars);
+        if (removeDataVolume) {
+            script += QLatin1String("\nsudo docker volume rm -f $CONTAINER_NAME-data 2>/dev/null || true");
+            script = SshSession::replaceVars(script, vars);
+        }
+        return script;
+    }
 }
 
 InstallController::InstallController(SecureServersRepository *serversRepository,
@@ -120,14 +135,10 @@ ErrorCode InstallController::setupContainer(const ServerCredentials &credentials
         return e;
     qDebug().noquote() << "InstallController::setupContainer prepareHostWorker finished";
 
-    amnezia::ScriptVars removeContainerVars =
+    const amnezia::ScriptVars removeContainerVars =
             amnezia::genBaseVars(credentials, container, QString(), QString());
-    if (!isUpdate) {
-        removeContainerVars.append({ { "$REMOVE_CONTAINER_DATA", QStringLiteral("1") } });
-    }
-    sshSession.runScript(credentials,
-                         sshSession.replaceVars(amnezia::scriptData(SharedScriptType::remove_container),
-                                                removeContainerVars));
+    const bool removeDataVolume = !isUpdate && usesNamedDataVolume(container);
+    sshSession.runScript(credentials, buildRemoveContainerScript(removeContainerVars, removeDataVolume));
     qDebug().noquote() << "InstallController::setupContainer removeContainer finished";
 
     qDebug().noquote() << "buildContainerWorker start";
@@ -980,12 +991,11 @@ ErrorCode InstallController::removeContainer(const QString &serverId, DockerCont
         return ErrorCode::InternalError;
     }
     SshSession sshSession(this);
-    amnezia::ScriptVars removeContainerVars =
+    const amnezia::ScriptVars removeContainerVars =
             amnezia::genBaseVars(credentials, container, QString(), QString());
-    removeContainerVars.append({ { "$REMOVE_CONTAINER_DATA", QStringLiteral("1") } });
-    ErrorCode errorCode = sshSession.runScript(
-            credentials,
-            sshSession.replaceVars(amnezia::scriptData(SharedScriptType::remove_container), removeContainerVars));
+    const bool removeDataVolume = usesNamedDataVolume(container);
+    ErrorCode errorCode =
+            sshSession.runScript(credentials, buildRemoveContainerScript(removeContainerVars, removeDataVolume));
 
     if (errorCode == ErrorCode::NoError) {
         QMap<DockerContainer, ContainerConfig> containers = adminConfig->containers;

client/core/controllers/settingsController.cpp

@@ -8,19 +8,10 @@
 #include "version.h"
 #include "ui/utils/qAutoStart.h"
 #include "logger.h"
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    #include "core/local-proxy/portavailabilityhelper.h"
-#endif
 #ifdef Q_OS_ANDROID
     #include "platforms/android/android_controller.h"
 #endif
 
-namespace {
-constexpr int kDefaultProxyPort = 10808;
-constexpr int kLocalProxyPortMin = 1024;
-constexpr int kLocalProxyPortMax = 65535;
-}
-
 QString getPlatformName()
 {
 #if defined(Q_OS_WINDOWS)
@@ -47,11 +38,6 @@ SettingsController::SettingsController(SecureServersRepository* serversRepositor
 {
     m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
     m_isDevModeEnabled = m_appSettingsRepository->isDevGatewayEnv();
-
-    connect(m_appSettingsRepository, &SecureAppSettingsRepository::localProxySettingsChanged, this,
-            &SettingsController::localProxySettingsUpdated);
-    connect(m_appSettingsRepository, &SecureAppSettingsRepository::localProxyStartFailed, this,
-            &SettingsController::localProxyStartFailed);
 }
 
 void SettingsController::toggleAmneziaDns(bool enable)
@@ -380,114 +366,3 @@ QString SettingsController::nextAvailableServerName() const
     return m_serversRepository->nextAvailableServerName();
 }
 
-bool SettingsController::isLocalProxySupported() const
-{
-#ifdef AMNEZIA_DESKTOP
-    return true;
-#else
-    return false;
-#endif
-}
-
-bool SettingsController::isLocalProxyHttpEnabled() const
-{
-    return m_appSettingsRepository->isLocalProxyHttpEnabled();
-}
-
-int SettingsController::localProxyPort() const
-{
-    return static_cast<int>(m_appSettingsRepository->localProxyPort());
-}
-
-QString SettingsController::localProxyOwnerId() const
-{
-    return m_appSettingsRepository->localProxyOwnerId();
-}
-
-bool SettingsController::isLocalProxyPortUserDefined() const
-{
-    return m_appSettingsRepository->isLocalProxyPortUserDefined();
-}
-
-bool SettingsController::setLocalProxyPort(int port)
-{
-    if (port < kLocalProxyPortMin || port > kLocalProxyPortMax) {
-        return false;
-    }
-
-    if (m_appSettingsRepository->localProxyPort() == static_cast<quint16>(port)) {
-        m_appSettingsRepository->setLocalProxyPortUserDefined(true);
-        return true;
-    }
-
-    m_appSettingsRepository->setLocalProxyPort(static_cast<quint16>(port));
-    m_appSettingsRepository->setLocalProxyPortUserDefined(true);
-    return true;
-}
-
-bool SettingsController::isLocalProxyPortBusy(int port) const
-{
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    return !PortAvailabilityHelper::isPortAvailable(port);
-#else
-    Q_UNUSED(port);
-    return false;
-#endif
-}
-
-int SettingsController::findFirstAvailableLocalProxyPort(int startPort) const
-{
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    const auto port = PortAvailabilityHelper::findFirstAvailablePort(startPort, kLocalProxyPortMax);
-    return port ? *port : -1;
-#else
-    Q_UNUSED(startPort);
-    return -1;
-#endif
-}
-
-bool SettingsController::enableLocalProxy(const QString &ownerId, int port)
-{
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    Q_UNUSED(ownerId);
-    Q_UNUSED(port);
-    return false;
-#else
-    if (port < kLocalProxyPortMin || port > kLocalProxyPortMax || ownerId.isEmpty()) {
-        return false;
-    }
-
-    if (m_appSettingsRepository->isLocalProxyHttpEnabled() && m_appSettingsRepository->localProxyOwnerId() != ownerId) {
-        return false;
-    }
-
-    int selectedPort = port;
-
-    const bool isUserDefinedPort = m_appSettingsRepository->isLocalProxyPortUserDefined();
-    if (isUserDefinedPort) {
-        if (!PortAvailabilityHelper::isPortAvailable(selectedPort)) {
-            return false;
-        }
-    } else if (selectedPort != kDefaultProxyPort && !PortAvailabilityHelper::isPortAvailable(selectedPort)) {
-        return false;
-    }
-
-    if (m_appSettingsRepository->localProxyPort() != static_cast<quint16>(selectedPort)) {
-        m_appSettingsRepository->setLocalProxyPort(static_cast<quint16>(selectedPort));
-    }
-    m_appSettingsRepository->setLocalProxyPortUserDefined(isUserDefinedPort);
-
-    m_appSettingsRepository->setLocalProxyOwnerId(ownerId);
-    m_appSettingsRepository->setLocalProxyHttpEnabled(true);
-
-    return true;
-#endif
-}
-
-void SettingsController::disableLocalProxy()
-{
-    if (m_appSettingsRepository->isLocalProxyHttpEnabled()) {
-        m_appSettingsRepository->setLocalProxyHttpEnabled(false);
-    }
-}
-

client/core/controllers/settingsController.h

@@ -89,18 +89,6 @@ public:
     QLocale getAppLanguage() const;
     void setAppLanguage(const QLocale &locale);
 
-    // Local proxy
-    bool isLocalProxySupported() const;
-    bool isLocalProxyHttpEnabled() const;
-    int localProxyPort() const;
-    QString localProxyOwnerId() const;
-    bool isLocalProxyPortUserDefined() const;
-    bool setLocalProxyPort(int port);
-    bool isLocalProxyPortBusy(int port) const;
-    int findFirstAvailableLocalProxyPort(int startPort) const;
-    bool enableLocalProxy(const QString &ownerId, int port);
-    void disableLocalProxy();
-
 signals:
     void siteSplitTunnelingRouteModeChanged(RouteMode mode);
     void siteSplitTunnelingToggled(bool enabled);
@@ -108,9 +96,6 @@ signals:
     void appSplitTunnelingToggled(bool enabled);
     void appSplitTunnelingClearAppsList();
 
-    void localProxySettingsUpdated();
-    void localProxyStartFailed(const QString &message);
-
 private:
     QString getPlatform() const;
 

client/core/local-proxy/configmanager.cpp

@@ -1,444 +0,0 @@
-#include "configmanager.h"
-
-#include "core/controllers/gatewayController.h"
-#include "core/repositories/secureAppSettingsRepository.h"
-#include "core/repositories/secureServersRepository.h"
-#include "core/utils/api/apiUtils.h"
-#include "core/utils/constants/apiConstants.h"
-#include "core/utils/constants/apiKeys.h"
-#include "core/utils/constants/configKeys.h"
-#include "core/utils/containers/containerUtils.h"
-#include "portavailabilityhelper.h"
-#include "proxylogger.h"
-#include "version.h"
-
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QSaveFile>
-#include <QSysInfo>
-#include <QStandardPaths>
-#include <QUuid>
-
-using namespace amnezia;
-
-ConfigManager::ConfigManager(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository)
-    : m_serversRepository(serversRepository), m_appSettingsRepository(appSettingsRepository)
-{
-    ProxyLogger::getInstance().debug("ConfigManager initialized (repository-backed)");
-}
-
-namespace {
-namespace gateway_key {
-constexpr char vless[] = "vless";
-} // namespace gateway_key
-
-constexpr quint16 kDefaultProxyPort = 10808;
-constexpr int kProxyPortMin = 1024;
-constexpr int kProxyPortMax = 65535;
-
-int resolveProxyPort(SecureAppSettingsRepository *appSettings)
-{
-    if (!appSettings) {
-        return kDefaultProxyPort;
-    }
-
-    const quint16 port = appSettings->localProxyPort();
-    if (port < kProxyPortMin || port > kProxyPortMax) {
-        return kDefaultProxyPort;
-    }
-
-    return static_cast<int>(port);
-}
-
-} // namespace
-
-bool ConfigManager::applyProxyPortToConfig(QJsonObject &config, int port) const
-{
-    if (!config.contains("inbounds") || !config.value("inbounds").isArray()) {
-        return false;
-    }
-
-    QJsonArray inbounds = config.value("inbounds").toArray();
-    if (inbounds.isEmpty() || !inbounds.at(0).isObject()) {
-        return false;
-    }
-
-    QJsonObject firstInbound = inbounds.at(0).toObject();
-    firstInbound.insert("port", port);
-    inbounds[0] = firstInbound;
-    config.insert("inbounds", inbounds);
-    return true;
-}
-
-QString ConfigManager::serializeConfig(const QJsonObject &config) const
-{
-    return QString::fromUtf8(QJsonDocument(config).toJson(QJsonDocument::Compact));
-}
-
-std::optional<ConfigManager::ConfigData> ConfigManager::buildConfig(QString &errorDescription) const
-{
-    errorDescription.clear();
-
-    if (!m_serversRepository || !m_appSettingsRepository) {
-        const QString message = QStringLiteral("Local proxy repositories are not available");
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const QString ownerId = m_appSettingsRepository->localProxyOwnerId();
-    if (ownerId.isEmpty()) {
-        const QString message = QStringLiteral("Local proxy owner server id is not configured");
-        ProxyLogger::getInstance().warning(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const auto ownerServer = m_serversRepository->serverJsonById(ownerId);
-    if (!ownerServer) {
-        const QString message = QStringLiteral("Owner server with id %1 not found").arg(ownerId);
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    if (!apiUtils::isPremiumServer(*ownerServer)) {
-        const QString message = QStringLiteral("Server %1 is not premium, local proxy is unavailable")
-                                        .arg(ownerServer->value(configKey::name).toString());
-        ProxyLogger::getInstance().warning(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const auto serializedConfig = extractSerializedXrayConfig(*ownerServer);
-    if (!serializedConfig || serializedConfig->isEmpty()) {
-        const QString message = QStringLiteral("Server %1 lacks Xray last_config payload")
-                                        .arg(ownerServer->value(configKey::name).toString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    QJsonParseError parseError;
-    const QJsonDocument doc = QJsonDocument::fromJson(serializedConfig->toUtf8(), &parseError);
-    if (parseError.error != QJsonParseError::NoError || !doc.isObject()) {
-        const QString message = QStringLiteral("Failed to parse Xray config JSON: %1").arg(parseError.errorString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    ConfigData data;
-    data.ownerId = ownerId;
-    data.serverName = ownerServer->value(configKey::name).toString();
-    data.parsedConfig = doc.object();
-    const int proxyPort = resolveProxyPort(m_appSettingsRepository);
-    if (applyProxyPortToConfig(data.parsedConfig, proxyPort)) {
-        data.serializedConfig = serializeConfig(data.parsedConfig);
-    } else {
-        ProxyLogger::getInstance().warning(QStringLiteral("Failed to override local proxy inbound port; using original config"));
-        data.serializedConfig = *serializedConfig;
-    }
-
-    return data;
-}
-
-std::optional<ConfigManager::ConfigData> ConfigManager::buildConfigWithFetch(QString &errorDescription) const
-{
-    errorDescription.clear();
-
-    if (!m_serversRepository || !m_appSettingsRepository) {
-        const QString message = QStringLiteral("Local proxy repositories are not available");
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const QString ownerId = m_appSettingsRepository->localProxyOwnerId();
-    if (ownerId.isEmpty()) {
-        const QString message = QStringLiteral("Local proxy owner server id is not configured");
-        ProxyLogger::getInstance().warning(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const auto ownerServer = m_serversRepository->serverJsonById(ownerId);
-    if (!ownerServer) {
-        const QString message = QStringLiteral("Owner server with id %1 not found").arg(ownerId);
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    if (!apiUtils::isPremiumServer(*ownerServer)) {
-        const QString message = QStringLiteral("Server %1 is not premium, local proxy is unavailable")
-                                        .arg(ownerServer->value(configKey::name).toString());
-        ProxyLogger::getInstance().warning(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    auto serializedConfig = extractSerializedXrayConfig(*ownerServer);
-    if (!serializedConfig || serializedConfig->isEmpty()) {
-        auto fetchedConfig = fetchSerializedXrayConfigFromGateway(*ownerServer, errorDescription);
-        if (!fetchedConfig || fetchedConfig->isEmpty()) {
-            return std::nullopt;
-        }
-        serializedConfig = fetchedConfig;
-    }
-
-    QJsonParseError parseError;
-    const QJsonDocument doc = QJsonDocument::fromJson(serializedConfig->toUtf8(), &parseError);
-    if (parseError.error != QJsonParseError::NoError || !doc.isObject()) {
-        const QString message = QStringLiteral("Failed to parse Xray config JSON: %1").arg(parseError.errorString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    ConfigData data;
-    data.ownerId = ownerId;
-    data.serverName = ownerServer->value(configKey::name).toString();
-    data.parsedConfig = doc.object();
-
-    int selectedPort = resolveProxyPort(m_appSettingsRepository);
-    const bool isUserDefinedPort = m_appSettingsRepository->isLocalProxyPortUserDefined();
-
-    if (!PortAvailabilityHelper::isPortAvailable(selectedPort)) {
-        const bool canAutoSelect = !isUserDefinedPort && selectedPort == kDefaultProxyPort;
-        if (canAutoSelect) {
-            const auto freePort = PortAvailabilityHelper::findFirstAvailablePort(kDefaultProxyPort + 1, kProxyPortMax);
-            if (!freePort) {
-                errorDescription = QStringLiteral("No available local proxy port in range %1-%2")
-                                       .arg(kDefaultProxyPort + 1)
-                                       .arg(kProxyPortMax);
-                ProxyLogger::getInstance().error(errorDescription);
-                return std::nullopt;
-            }
-            selectedPort = *freePort;
-        } else {
-            errorDescription = QStringLiteral("Local proxy port %1 is already in use")
-                                   .arg(selectedPort);
-            ProxyLogger::getInstance().error(errorDescription);
-            return std::nullopt;
-        }
-    }
-
-    if (applyProxyPortToConfig(data.parsedConfig, selectedPort)) {
-        data.serializedConfig = serializeConfig(data.parsedConfig);
-    } else {
-        ProxyLogger::getInstance().warning(QStringLiteral("Failed to override local proxy inbound port; using original config"));
-        data.serializedConfig = *serializedConfig;
-    }
-
-    return data;
-}
-
-bool ConfigManager::writeTempConfig(const QString &serializedConfig, QString &configPath, QString &errorDescription) const
-{
-    errorDescription.clear();
-    configPath.clear();
-
-    const QString directory = tempDirectory();
-    if (!QDir().mkpath(directory)) {
-        const QString message = QStringLiteral("Failed to create temp config directory: %1").arg(directory);
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return false;
-    }
-
-    const QString path = tempConfigPath();
-    QSaveFile file(path);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        const QString message = QStringLiteral("Failed to open temp config file %1: %2").arg(path, file.errorString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return false;
-    }
-
-    if (file.write(serializedConfig.toUtf8()) == -1) {
-        const QString message = QStringLiteral("Failed to write temp config file %1: %2").arg(path, file.errorString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return false;
-    }
-
-    if (!file.commit()) {
-        const QString message = QStringLiteral("Failed to commit temp config file %1").arg(path);
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return false;
-    }
-
-    ProxyLogger::getInstance().info(QStringLiteral("Xray config saved to %1").arg(path));
-    configPath = path;
-    return true;
-}
-
-bool ConfigManager::removeTempConfig() const
-{
-    const QString path = tempConfigPath();
-    QFile file(path);
-    if (!file.exists()) {
-        return true;
-    }
-
-    if (!file.remove()) {
-        ProxyLogger::getInstance().warning(QStringLiteral("Failed to remove temp config file %1: %2").arg(path, file.errorString()));
-        return false;
-    }
-
-    ProxyLogger::getInstance().debug(QStringLiteral("Removed temp config file %1").arg(path));
-    return true;
-}
-
-QString ConfigManager::tempConfigPath() const
-{
-    return QDir(tempDirectory()).filePath(QStringLiteral("xray_active.json"));
-}
-
-std::optional<QString> ConfigManager::extractSerializedXrayConfig(const QJsonObject &server) const
-{
-    const QJsonArray containers = server.value(configKey::containers).toArray();
-    const QString targetContainer = ContainerUtils::containerToString(DockerContainer::Xray);
-    const QString protoKey = QString(configKey::xray);
-
-    for (const QJsonValue &value : containers) {
-        const QJsonObject container = value.toObject();
-        if (container.value(configKey::container).toString() != targetContainer) {
-            continue;
-        }
-
-        const QJsonObject proto = container.value(protoKey).toObject();
-        const QString serialized = proto.value(configKey::lastConfig).toString();
-        if (!serialized.isEmpty()) {
-            return serialized;
-        }
-    }
-
-    return std::nullopt;
-}
-
-std::optional<QString> ConfigManager::fetchSerializedXrayConfigFromGateway(const QJsonObject &server, QString &errorDescription) const
-{
-    errorDescription.clear();
-
-    if (!m_appSettingsRepository) {
-        const QString message = QStringLiteral("App settings repository is not available");
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const QJsonObject apiConfig = server.value(apiDefs::key::apiConfig).toObject();
-    if (apiConfig.isEmpty()) {
-        const QString message = QStringLiteral("Server API config is missing");
-        ProxyLogger::getInstance().warning(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const QString userCountryCode = apiConfig.value(apiDefs::key::userCountryCode).toString();
-    const QString serviceType = apiConfig.value(apiDefs::key::serviceType).toString();
-    if (userCountryCode.isEmpty() || serviceType.isEmpty()) {
-        const QString message = QStringLiteral("Server API config lacks service identifiers");
-        ProxyLogger::getInstance().warning(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    QJsonObject apiPayload;
-    apiPayload[apiDefs::key::osVersion] = QSysInfo::productType();
-    apiPayload[apiDefs::key::appVersion] = QString(APP_VERSION);
-
-    const QString appLanguage = m_appSettingsRepository->getAppLanguage().name().split("_").first();
-    if (!appLanguage.isEmpty()) {
-        apiPayload[apiDefs::key::appLanguage] = appLanguage;
-    }
-
-    apiPayload[apiDefs::key::uuid] = m_appSettingsRepository->getInstallationUuid(true);
-    apiPayload[apiDefs::key::userCountryCode] = userCountryCode;
-    apiPayload[apiDefs::key::serviceType] = serviceType;
-    apiPayload[apiDefs::key::serviceProtocol] = QString(gateway_key::vless);
-    apiPayload[apiDefs::key::publicKey] = QUuid::createUuid().toString(QUuid::WithoutBraces);
-
-    const QJsonObject authData = server.value(apiDefs::key::authData).toObject();
-    if (!authData.isEmpty()) {
-        apiPayload[apiDefs::key::authData] = authData;
-    }
-
-    GatewayController gatewayController(m_appSettingsRepository->getGatewayEndpoint(), m_appSettingsRepository->isDevGatewayEnv(),
-                                        apiDefs::requestTimeoutMsecs, m_appSettingsRepository->isStrictKillSwitchEnabled());
-
-    QByteArray responseBody;
-    const amnezia::ErrorCode errorCode = gatewayController.post(QString("%1v1/config"), apiPayload, responseBody);
-    if (errorCode != amnezia::ErrorCode::NoError) {
-        const QString message = QStringLiteral("Gateway request failed with error code %1").arg(static_cast<int>(errorCode));
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    QJsonParseError responseError;
-    const QJsonDocument responseDoc = QJsonDocument::fromJson(responseBody, &responseError);
-    if (responseError.error != QJsonParseError::NoError || !responseDoc.isObject()) {
-        const QString message = QStringLiteral("Failed to parse gateway response: %1").arg(responseError.errorString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    QString data = responseDoc.object().value(configKey::config).toString();
-    if (data.isEmpty()) {
-        const QString message = QStringLiteral("Gateway response lacks config payload");
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    data.replace("vpn://", "");
-    QByteArray decoded = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-    if (decoded.isEmpty()) {
-        const QString message = QStringLiteral("Gateway config payload is empty");
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const QByteArray uncompressed = qUncompress(decoded);
-    if (!uncompressed.isEmpty()) {
-        decoded = uncompressed;
-    }
-
-    QJsonParseError configError;
-    const QJsonDocument configDoc = QJsonDocument::fromJson(decoded, &configError);
-    if (configError.error != QJsonParseError::NoError || !configDoc.isObject()) {
-        const QString message = QStringLiteral("Failed to parse gateway config JSON: %1").arg(configError.errorString());
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    const auto serializedConfig = extractSerializedXrayConfig(configDoc.object());
-    if (!serializedConfig || serializedConfig->isEmpty()) {
-        const QString message = QStringLiteral("Gateway response lacks Xray last_config payload");
-        ProxyLogger::getInstance().error(message);
-        errorDescription = message;
-        return std::nullopt;
-    }
-
-    ProxyLogger::getInstance().info("Fetched Xray config from gateway");
-    return serializedConfig;
-}
-
-QString ConfigManager::tempDirectory() const
-{
-    const QString baseDir = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
-    if (baseDir.isEmpty()) {
-        return QDir::temp().filePath(QStringLiteral("amnezia_local_proxy"));
-    }
-    return QDir(baseDir).filePath(QStringLiteral("local_proxy"));
-}

client/core/local-proxy/configmanager.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <optional>
-
-#include <QJsonObject>
-#include <QString>
-
-class SecureServersRepository;
-class SecureAppSettingsRepository;
-
-class ConfigManager {
-public:
-    struct ConfigData {
-        QString ownerId;
-        QString serverName;
-        QString serializedConfig;
-        QJsonObject parsedConfig;
-    };
-
-    ConfigManager(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository);
-
-    std::optional<ConfigData> buildConfig(QString &errorDescription) const;
-    std::optional<ConfigData> buildConfigWithFetch(QString &errorDescription) const;
-    bool writeTempConfig(const QString &serializedConfig, QString &configPath, QString &errorDescription) const;
-    bool removeTempConfig() const;
-    QString tempConfigPath() const;
-
-private:
-    std::optional<QString> extractSerializedXrayConfig(const QJsonObject &server) const;
-    std::optional<QString> fetchSerializedXrayConfigFromGateway(const QJsonObject &server, QString &errorDescription) const;
-    QString tempDirectory() const;
-    bool applyProxyPortToConfig(QJsonObject &config, int port) const;
-    QString serializeConfig(const QJsonObject &config) const;
-
-    SecureServersRepository *m_serversRepository;
-    SecureAppSettingsRepository *m_appSettingsRepository;
-};

client/core/local-proxy/httpapi.cpp

@@ -1,190 +0,0 @@
-#include "httpapi.h"
-#include "proxylogger.h"
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QHostAddress>
-#include <optional>
-
-namespace {
-
-std::optional<int> extractInboundPort(const QJsonObject &config)
-{
-    if (!config.contains("inbounds") || !config["inbounds"].isArray()) {
-        return std::nullopt;
-    }
-
-    const QJsonArray inbounds = config["inbounds"].toArray();
-    if (inbounds.isEmpty() || !inbounds.at(0).isObject()) {
-        return std::nullopt;
-    }
-
-    const QJsonObject firstInbound = inbounds.at(0).toObject();
-    if (!firstInbound.contains("port")) {
-        return std::nullopt;
-    }
-
-    return firstInbound.value("port").toInt();
-}
-
-QJsonValue proxyPortValue(const std::optional<int> &port)
-{
-    if (port.has_value()) {
-        return QJsonValue(*port);
-    }
-    return QJsonValue::Null;
-}
-
-QHttpServerResponse makeServiceUnavailablePingResponse()
-{
-    QJsonObject payload{
-        {"status", "error"},
-        {"proxyPort", QJsonValue::Null}
-    };
-    return QHttpServerResponse(payload, QHttpServerResponse::StatusCode::ServiceUnavailable);
-}
-
-QHttpServerResponse makeServiceUnavailableStatusResponse()
-{
-    QJsonObject payload{
-        {"status", "error"}
-    };
-    return QHttpServerResponse(payload, QHttpServerResponse::StatusCode::ServiceUnavailable);
-}
-
-} // namespace
-
-HttpApi::HttpApi(QWeakPointer<IProxyService> service, QObject* parent)
-    : QObject(parent)
-    , m_tcpServer(new QTcpServer(this))
-    , m_service(service)
-{
-    ProxyLogger::getInstance().debug("HttpApi initialized");
-}
-
-HttpApi::~HttpApi()
-{
-    stop();
-}
-
-bool HttpApi::start(quint16 port)
-{
-    ProxyLogger::getInstance().info(QString("Starting HTTP API server on port %1").arg(port));
-    
-    if (!m_tcpServer->listen(QHostAddress::LocalHost, port)) {
-        ProxyLogger::getInstance().error(QString("Failed to start HTTP API server on port %1").arg(port));
-        return false;
-    }
-
-    setupRoutes();
-    m_server.bind(m_tcpServer.data());
-    
-    ProxyLogger::getInstance().info(QString("HTTP API server is running on localhost:%1").arg(m_tcpServer->serverPort()));
-    ProxyLogger::getInstance().debug("Available endpoints:\n"
-                              "  POST   /api/v1/up\n"
-                              "  POST   /api/v1/down\n"
-                              "  GET    /api/v1/ping");
-    return true;
-}
-
-void HttpApi::stop()
-{
-    ProxyLogger::getInstance().info("Stopping HTTP API server");
-    if (m_tcpServer) {
-        m_tcpServer->close();
-    }
-}
-
-void HttpApi::setupRoutes()
-{
-    ProxyLogger::getInstance().debug("Setting up HTTP API routes");
-
-    m_server.route("/api/v1/up", QHttpServerRequest::Method::Post,
-        [this] {
-            ProxyLogger::getInstance().debug("Handling POST /api/v1/up request");
-            return handlePostUp();
-        });
-
-    m_server.route("/api/v1/down", QHttpServerRequest::Method::Post,
-        [this] {
-            ProxyLogger::getInstance().debug("Handling POST /api/v1/down request");
-            return handlePostDown();
-        });
-
-    m_server.route("/api/v1/ping", QHttpServerRequest::Method::Get,
-        [this] {
-            ProxyLogger::getInstance().debug("Handling GET /api/v1/ping request");
-            return handleGetPing();
-        });
-}
-
-QHttpServerResponse HttpApi::handlePostUp()
-{
-    if (auto service = m_service.lock()) {
-        const bool started = service->startXray();
-        QJsonObject response;
-        response["status"] = started ? "ok" : "error";
-
-        const auto port = started ? extractInboundPort(service->getConfig()) : std::optional<int>{};
-        response["proxyPort"] = proxyPortValue(port);
-
-        if (started) {
-            if (port.has_value()) {
-                ProxyLogger::getInstance().info(QString("Xray process started on port %1").arg(*port));
-            } else {
-                ProxyLogger::getInstance().warning("Xray started but inbound port is unknown (local proxy owner may be missing)");
-            }
-        } else {
-            ProxyLogger::getInstance().warning("Failed to start Xray process via HTTP API");
-        }
-
-        return QHttpServerResponse(response);
-    }
-
-    ProxyLogger::getInstance().error("Service unavailable: proxy backend is not initialized");
-    return makeServiceUnavailablePingResponse();
-}
-
-QHttpServerResponse HttpApi::handlePostDown()
-{
-    if (auto service = m_service.lock()) {
-        const bool stopped = service->stopXray();
-        QJsonObject response;
-        response["status"] = stopped ? "ok" : "error";
-        if (!stopped) {
-            ProxyLogger::getInstance().warning("Failed to stop Xray process via HTTP API");
-        } else {
-            ProxyLogger::getInstance().info("Xray process stopped via HTTP API");
-        }
-
-        return QHttpServerResponse(response);
-    }
-
-    ProxyLogger::getInstance().error("Service unavailable: proxy backend is not initialized");
-    return makeServiceUnavailableStatusResponse();
-}
-
-QHttpServerResponse HttpApi::handleGetPing() const
-{
-    if (auto service = m_service.lock()) {
-        QJsonObject response;
-        response["status"] = "ok";
-        const bool isRunning = service->isXrayRunning();
-        if (isRunning) {
-            const auto port = extractInboundPort(service->getConfig());
-            response["proxyPort"] = proxyPortValue(port);
-            if (port.has_value()) {
-                ProxyLogger::getInstance().debug(QString("Xray port: %1").arg(*port));
-            } else {
-                ProxyLogger::getInstance().warning("Unable to detect inbound port while Xray is running");
-            }
-        } else {
-            response["proxyPort"] = QJsonValue::Null;
-            ProxyLogger::getInstance().debug("Xray is not running");
-        }
-
-        return QHttpServerResponse(response);
-    }
-
-    ProxyLogger::getInstance().error("Service unavailable: proxy backend is not initialized");
-    return makeServiceUnavailablePingResponse();
-}

client/core/local-proxy/httpapi.h

@@ -1,32 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QScopedPointer>
-#include <QHttpServer>
-#include <QHttpServerRequest>
-#include <QHttpServerResponse>
-#include <QTcpServer>
-#include <QWeakPointer>
-#include "iproxyservice.h"
-
-class HttpApi : public QObject {
-    Q_OBJECT
-
-public:
-    explicit HttpApi(QWeakPointer<IProxyService> service, QObject* parent = nullptr);
-    ~HttpApi();
-
-    bool start(quint16 port);
-    void stop();
-
-private:
-    void setupRoutes();
-
-    QHttpServerResponse handlePostUp();
-    QHttpServerResponse handlePostDown();
-    QHttpServerResponse handleGetPing() const;
-
-    QHttpServer m_server;
-    QScopedPointer<QTcpServer> m_tcpServer;
-    QWeakPointer<IProxyService> m_service;
-}; 

client/core/local-proxy/iproxyservice.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <QJsonObject>
-#include <QString>
-
-class IProxyService {
-public:
-    virtual ~IProxyService() = default;
-
-    virtual QJsonObject getConfig() = 0;
-
-    virtual bool startXray() = 0;
-    virtual bool stopXray() = 0;
-    virtual bool isXrayRunning() const = 0;
-    virtual qint64 getXrayProcessId() const = 0;
-    virtual QString getXrayError() const = 0;
-}; 

client/core/local-proxy/portavailabilityhelper.cpp

@@ -1,43 +0,0 @@
-#include "portavailabilityhelper.h"
-
-#include <QHostAddress>
-#include <QTcpServer>
-
-namespace {
-constexpr int kProxyPortMin = 1024;
-constexpr int kProxyPortMax = 65535;
-}
-
-bool PortAvailabilityHelper::isPortAvailable(int port)
-{
-    if (port < kProxyPortMin || port > kProxyPortMax) {
-        return false;
-    }
-
-    QTcpServer server;
-    const bool success = server.listen(QHostAddress::LocalHost, static_cast<quint16>(port));
-    server.close();
-    return success;
-}
-
-std::optional<int> PortAvailabilityHelper::findFirstAvailablePort(int startPort, int endPort)
-{
-    if (startPort < kProxyPortMin) {
-        startPort = kProxyPortMin;
-    }
-    if (endPort > kProxyPortMax) {
-        endPort = kProxyPortMax;
-    }
-    if (startPort > endPort) {
-        return std::nullopt;
-    }
-
-    for (int port = startPort; port <= endPort; ++port) {
-        if (isPortAvailable(port)) {
-            return port;
-        }
-    }
-
-    return std::nullopt;
-}
-

client/core/local-proxy/portavailabilityhelper.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include <optional>
-
-class PortAvailabilityHelper
-{
-public:
-    static bool isPortAvailable(int port);
-    static std::optional<int> findFirstAvailablePort(int startPort, int endPort);
-};
-

client/core/local-proxy/proxylogger.cpp

@@ -1,133 +0,0 @@
-#include "proxylogger.h"
-#include <QDir>
-#include <QTextStream>
-
-ProxyLogger::ProxyLogger() : m_maxFileSize(0), m_currentLevel(LogLevel::Info)
-{
-}
-
-ProxyLogger::~ProxyLogger()
-{
-}
-
-ProxyLogger& ProxyLogger::getInstance()
-{
-    static ProxyLogger instance;
-    return instance;
-}
-
-void ProxyLogger::init(const QString& logPath, qint64 maxFileSize)
-{
-    QMutexLocker locker(&m_mutex);
-    m_logPath = logPath;
-    m_maxFileSize = maxFileSize;
-    
-    // Create logs directory if it doesn't exist
-    QDir dir = QFileInfo(m_logPath).dir();
-    if (!dir.exists()) {
-        dir.mkpath(".");
-    }
-}
-
-void ProxyLogger::setLogLevel(LogLevel level)
-{
-    m_currentLevel = level;
-}
-
-void ProxyLogger::log(LogLevel level, const QString& message)
-{
-    logInternal(level, message);
-}
-
-void ProxyLogger::debug(const QString& message)
-{
-    logInternal(LogLevel::Debug, message);
-}
-
-void ProxyLogger::info(const QString& message)
-{
-    logInternal(LogLevel::Info, message);
-}
-
-void ProxyLogger::warning(const QString& message)
-{
-    logInternal(LogLevel::Warning, message);
-}
-
-void ProxyLogger::error(const QString& message)
-{
-    logInternal(LogLevel::Error, message);
-}
-
-void ProxyLogger::logInternal(LogLevel level, const QString& message)
-{
-    if (m_logPath.isEmpty()) {
-        return;
-    }
-    
-    if (level < m_currentLevel) {
-        return;
-    }
-
-    QMutexLocker locker(&m_mutex);
-    
-    checkRotation();
-
-    QFile file(m_logPath);
-    if (!openLogFile(file)) {
-        return;
-    }
-
-    QTextStream stream(&file);
-    QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz");
-    stream << QString("[%1] [%2] %3\n").arg(timestamp, levelToString(level), message);
-    stream.flush();
-    file.close();
-}
-
-QString ProxyLogger::levelToString(LogLevel level)
-{
-    switch (level) {
-        case LogLevel::Debug:   return "DEBUG";
-        case LogLevel::Info:    return "INFO";
-        case LogLevel::Warning: return "WARNING";
-        case LogLevel::Error:   return "ERROR";
-        default:               return "UNKNOWN";
-    }
-}
-
-qint64 ProxyLogger::getCurrentFileSize() const
-{
-    QFile file(m_logPath);
-    if (file.exists()) {
-        return file.size();
-    }
-    return -1;
-}
-
-void ProxyLogger::checkRotation()
-{
-    if (m_maxFileSize > 0 && getCurrentFileSize() >= m_maxFileSize) {
-        // Delete the oldest file
-        QFile::remove(QString("%1.%2").arg(m_logPath).arg(MAX_BACKUP_FILES));
-
-        // Shift existing files
-        for (int i = MAX_BACKUP_FILES - 1; i >= 1; --i) {
-            QString oldName = QString("%1.%2").arg(m_logPath).arg(i);
-            QString newName = QString("%1.%2").arg(m_logPath).arg(i + 1);
-            QFile::rename(oldName, newName);
-        }
-
-        // Rename current file
-        QFile::rename(m_logPath, m_logPath + ".1");
-    }
-}
-
-bool ProxyLogger::openLogFile(QFile& file)
-{
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) {
-        qDebug() << "Failed to open log file:" << m_logPath;
-        return false;
-    }
-    return true;
-} 

client/core/local-proxy/proxylogger.h

@@ -1,54 +0,0 @@
-#ifndef LOCAL_PROXY_LOGGER_H
-#define LOCAL_PROXY_LOGGER_H
-
-#include <QObject>
-#include <QFile>
-#include <QDateTime>
-#include <QMutex>
-#include <QString>
-
-class ProxyLogger
-{
-
-public:
-    enum class LogLevel {
-        Debug,
-        Info,
-        Warning,
-        Error
-    };
-
-    static ProxyLogger& getInstance();
-
-    void init(const QString& logPath, qint64 maxFileSize = 1024 * 1024 * 10); // 10MB by default
-    void setLogLevel(LogLevel level);
-
-    // Main logging method
-    void log(LogLevel level, const QString& message);
-
-    // Helper methods for convenience
-    void debug(const QString& message);
-    void info(const QString& message);
-    void warning(const QString& message);
-    void error(const QString& message);
-
-private:
-    ProxyLogger();
-    ~ProxyLogger();
-    ProxyLogger(const ProxyLogger&) = delete;
-    ProxyLogger& operator=(const ProxyLogger&) = delete;
-
-    void logInternal(LogLevel level, const QString& message);
-    void checkRotation();
-    QString levelToString(LogLevel level);
-    bool openLogFile(QFile& file);
-    qint64 getCurrentFileSize() const;
-
-    QString m_logPath;
-    qint64 m_maxFileSize;
-    LogLevel m_currentLevel;
-    QMutex m_mutex;
-    static const int MAX_BACKUP_FILES = 3;
-};
-
-#endif // LOCAL_PROXY_LOGGER_H 

client/core/local-proxy/proxyserver.cpp

@@ -1,114 +0,0 @@
-#include "proxyserver.h"
-
-#include "core/repositories/secureAppSettingsRepository.h"
-#include "core/repositories/secureServersRepository.h"
-
-#include <QDebug>
-
-ProxyServer::ProxyServer(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
-                         QObject *parent)
-    : QObject(parent)
-    , m_appSettingsRepository(appSettingsRepository)
-    , m_service(new ProxyService(serversRepository, appSettingsRepository, this))
-{
-    m_lastRestartToken = m_appSettingsRepository ? m_appSettingsRepository->localProxyRestartToken() : 0;
-}
-
-ProxyServer::~ProxyServer()
-{
-    stop();
-}
-
-bool ProxyServer::start(quint16 port)
-{
-    if (m_isRunning) {
-        if (m_currentApiPort == port) {
-            qInfo() << "Local proxy: already running on port" << port;
-            return true;
-        }
-
-        qInfo() << "Local proxy: restarting on new port" << port;
-        stop();
-    }
-
-    m_api.reset(new HttpApi(m_service.toWeakRef()));
-    const bool apiStarted = m_api->start(port);
-    if (!apiStarted) {
-        qWarning() << "Local proxy: port is busy:" << port;
-        m_api.reset();
-        m_isRunning = false;
-        m_currentApiPort = 0;
-        return false;
-    }
-
-    m_isRunning = true;
-    m_currentApiPort = port;
-
-    return true;
-}
-
-void ProxyServer::stop()
-{
-    stopXrayProcess();
-    if (m_api) {
-        m_api->stop();
-        m_api.reset();
-    }
-    m_isRunning = false;
-    m_currentApiPort = 0;
-    m_currentProxyPort = 0;
-}
-
-bool ProxyServer::startXrayProcess()
-{
-    return m_service->startXray();
-}
-
-void ProxyServer::stopXrayProcess()
-{
-    m_service->stopXray();
-}
-
-bool ProxyServer::syncSettings()
-{
-    if (!m_isRunning) {
-        qDebug() << "Local proxy: syncSettings called but server is not running";
-        return false;
-    }
-
-    const quint16 newProxyPort = m_appSettingsRepository ? m_appSettingsRepository->localProxyPort() : 0;
-    const int restartToken = m_appSettingsRepository ? m_appSettingsRepository->localProxyRestartToken() : 0;
-    const bool xrayRunning = m_service->isXrayRunning();
-
-    if (!xrayRunning) {
-        qInfo() << "Local proxy: starting Xray on port" << newProxyPort;
-        const bool started = startXrayProcess();
-        if (started) {
-            m_currentProxyPort = newProxyPort;
-            m_lastRestartToken = restartToken;
-        }
-        return started;
-    }
-
-    if (m_lastRestartToken != restartToken) {
-        qInfo() << "Local proxy: restarting Xray due to config change token";
-        const bool restarted = m_service->restartXray();
-        if (restarted) {
-            m_currentProxyPort = newProxyPort;
-            m_lastRestartToken = restartToken;
-        }
-        return restarted;
-    }
-
-    if (m_currentProxyPort != newProxyPort) {
-        qInfo() << "Local proxy: proxy port changed from" << m_currentProxyPort << "to" << newProxyPort;
-        const bool restarted = m_service->restartXray();
-        if (restarted) {
-            m_currentProxyPort = newProxyPort;
-            m_lastRestartToken = restartToken;
-        }
-        return restarted;
-    }
-
-    return true;
-}

client/core/local-proxy/proxyserver.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QScopedPointer>
-#include <QSharedPointer>
-
-#include "httpapi.h"
-#include "proxyservice.h"
-
-class SecureServersRepository;
-class SecureAppSettingsRepository;
-
-class ProxyServer : public QObject
-{
-    Q_OBJECT
-
-public:
-    ProxyServer(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
-                QObject *parent = nullptr);
-    ~ProxyServer();
-
-    bool start(quint16 port = 49490);
-    void stop();
-    bool syncSettings();
-
-private:
-    bool startXrayProcess();
-    void stopXrayProcess();
-
-    SecureAppSettingsRepository *m_appSettingsRepository;
-    QScopedPointer<HttpApi> m_api;
-    QSharedPointer<ProxyService> m_service;
-    bool m_isRunning {false};
-    quint16 m_currentApiPort {0};
-    quint16 m_currentProxyPort {0};
-    int m_lastRestartToken {0};
-};

client/core/local-proxy/proxyservice.cpp

@@ -1,118 +0,0 @@
-#include "proxyservice.h"
-
-#include "proxylogger.h"
-
-namespace {
-
-void logConfigError(const QString &errorMessage)
-{
-    if (!errorMessage.isEmpty()) {
-        ProxyLogger::getInstance().error(errorMessage);
-    }
-}
-
-} // namespace
-
-ProxyService::ProxyService(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
-                           QObject *parent)
-    : QObject(parent)
-    , m_configManager(new ConfigManager(serversRepository, appSettingsRepository))
-    , m_xrayController(new XrayController())
-{
-    ProxyLogger::getInstance().debug("ProxyService initialized");
-}
-
-QJsonObject ProxyService::getConfig()
-{
-    if (!m_cachedConfig.isEmpty()) {
-        return m_cachedConfig;
-    }
-
-    QString error;
-    const auto configData = m_configManager->buildConfigWithFetch(error);
-    if (!configData) {
-        logConfigError(error);
-        return {};
-    }
-
-    m_cachedConfig = configData->parsedConfig;
-    return m_cachedConfig;
-}
-
-bool ProxyService::startXray()
-{
-    ProxyLogger::getInstance().info("Starting Xray");
-
-    if (m_xrayController->isXrayRunning()) {
-        ProxyLogger::getInstance().info("Xray is already running");
-        return true;
-    }
-
-    QString error;
-    const auto configData = m_configManager->buildConfigWithFetch(error);
-    if (!configData) {
-        logConfigError(error);
-        return false;
-    }
-
-    const bool success = m_xrayController->start(configData->serializedConfig);
-    if (success) {
-        m_cachedConfig = configData->parsedConfig;
-        ProxyLogger::getInstance().info("Xray started successfully");
-        emit xrayStatusChanged(true);
-        return true;
-    }
-
-    ProxyLogger::getInstance().error(QStringLiteral("Failed to start Xray: %1").arg(m_xrayController->getError()));
-    return false;
-}
-
-bool ProxyService::stopXray()
-{
-    ProxyLogger::getInstance().info("Stopping Xray");
-    const bool stopped = m_xrayController->stop();
-    if (stopped) {
-        ProxyLogger::getInstance().info("Xray stopped");
-        emit xrayStatusChanged(false);
-        return true;
-    }
-
-    ProxyLogger::getInstance().warning(QStringLiteral("Failed to stop Xray: %1").arg(m_xrayController->getError()));
-    return false;
-}
-
-bool ProxyService::isXrayRunning() const
-{
-    return m_xrayController->isXrayRunning();
-}
-
-qint64 ProxyService::getXrayProcessId() const
-{
-    return m_xrayController->getProcessId();
-}
-
-QString ProxyService::getXrayError() const
-{
-    return m_xrayController->getError();
-}
-
-void ProxyService::clearCache()
-{
-    m_cachedConfig = QJsonObject();
-    ProxyLogger::getInstance().debug("ProxyService cache cleared");
-}
-
-bool ProxyService::restartXray()
-{
-    ProxyLogger::getInstance().info("Restarting Xray with updated config");
-    clearCache();
-
-    if (m_xrayController->isXrayRunning()) {
-        if (!stopXray()) {
-            ProxyLogger::getInstance().error("Failed to stop Xray during restart, aborting");
-            return false;
-        }
-    }
-
-    return startXray();
-}

client/core/local-proxy/proxyservice.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include "configmanager.h"
-#include "iproxyservice.h"
-#include "xraycontroller.h"
-
-#include <QObject>
-#include <QScopedPointer>
-#include <QJsonObject>
-
-class SecureServersRepository;
-class SecureAppSettingsRepository;
-
-class ProxyService : public QObject, public IProxyService {
-    Q_OBJECT
-
-public:
-    ProxyService(SecureServersRepository *serversRepository, SecureAppSettingsRepository *appSettingsRepository,
-                 QObject *parent = nullptr);
-    ~ProxyService() = default;
-
-    QJsonObject getConfig() override;
-    bool startXray() override;
-    bool stopXray() override;
-    bool isXrayRunning() const override;
-    qint64 getXrayProcessId() const override;
-    QString getXrayError() const override;
-
-    void clearCache();
-    bool restartXray();
-
-signals:
-    void xrayStatusChanged(bool running);
-
-private:
-    QScopedPointer<ConfigManager> m_configManager;
-    QScopedPointer<XrayController> m_xrayController;
-    QJsonObject m_cachedConfig;
-}; 

client/core/local-proxy/xraycontroller.cpp

@@ -1,105 +0,0 @@
-#include "xraycontroller.h"
-
-#include "proxylogger.h"
-#include "core/utils/ipcClient.h"
-
-namespace {
-const QString kIpcUnavailableError = QStringLiteral("Failed to communicate with IPC service");
-}
-
-XrayController::XrayController(QObject *parent)
-    : QObject(parent)
-{
-    ProxyLogger::getInstance().debug("XrayController initialized");
-}
-
-XrayController::~XrayController()
-{
-    stop();
-}
-
-bool XrayController::start(const QString &configJson)
-{
-    if (m_isRunning) {
-        ProxyLogger::getInstance().info("Xray is already running");
-        return true;
-    }
-
-    ProxyLogger::getInstance().info("Request to start Xray via IPC");
-
-    m_lastError.clear();
-
-    if (configJson.trimmed().isEmpty()) {
-        m_lastError = QStringLiteral("Config content is empty");
-        ProxyLogger::getInstance().error(m_lastError);
-        return false;
-    }
-
-    const bool ipcResult = IpcClient::withInterface([&](QSharedPointer<IpcInterfaceReplica> iface) {
-        auto xrayStart = iface->xrayStart(configJson);
-        if (!xrayStart.waitForFinished() || !xrayStart.returnValue()) {
-            ProxyLogger::getInstance().warning("Failed to start Xray via IPC");
-            return false;
-        }
-
-        return true;
-    }, []() {
-        return false;
-    });
-
-    if (!ipcResult) {
-        m_lastError = kIpcUnavailableError;
-        ProxyLogger::getInstance().error(m_lastError);
-        return false;
-    }
-
-    ProxyLogger::getInstance().info("Xray start command sent to IPC service");
-    m_isRunning = true;
-    return true;
-}
-
-bool XrayController::stop()
-{
-    if (!m_isRunning) {
-        ProxyLogger::getInstance().debug("Skipping Xray stop via IPC: local proxy Xray is not running");
-        return true;
-    }
-
-    ProxyLogger::getInstance().info("Stopping Xray via IPC");
-
-    const bool ipcResult = IpcClient::withInterface([](QSharedPointer<IpcInterfaceReplica> iface) {
-        auto xrayStop = iface->xrayStop();
-        if (!xrayStop.waitForFinished() || !xrayStop.returnValue()) {
-            ProxyLogger::getInstance().warning("Failed to stop Xray via IPC");
-            return false;
-        }
-
-        return true;
-    }, []() {
-        return false;
-    });
-
-    if (!ipcResult) {
-        m_lastError = kIpcUnavailableError;
-        ProxyLogger::getInstance().warning(m_lastError);
-        return false;
-    }
-
-    m_isRunning = false;
-    return true;
-}
-
-bool XrayController::isXrayRunning() const
-{
-    return m_isRunning;
-}
-
-qint64 XrayController::getProcessId() const
-{
-    return -1;
-}
-
-QString XrayController::getError() const
-{
-    return m_lastError;
-}

client/core/local-proxy/xraycontroller.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QString>
-
-class XrayController : public QObject {
-    Q_OBJECT
-
-public:
-    explicit XrayController(QObject* parent = nullptr);
-    ~XrayController();
-
-    bool start(const QString& configJson);
-    bool stop();
-    bool isXrayRunning() const;
-    qint64 getProcessId() const;
-    QString getError() const;
-
-private:
-    bool m_isRunning {false};
-    QString m_lastError;
-}; 

client/core/repositories/secureAppSettingsRepository.cpp

@@ -5,8 +5,6 @@
 #include <QJsonObject>
 #include <QUuid>
 
-#include <limits>
-
 #include "core/utils/errorCodes.h"
 #include "core/utils/routeModes.h"
 #include "core/utils/commonStructs.h"
@@ -442,59 +440,3 @@ void SecureAppSettingsRepository::setXraySavedConfigs(const QByteArray &data)
 {
     setValue("Xray/savedConfigs", data);
 }
-
-QString SecureAppSettingsRepository::localProxyOwnerId() const
-{
-    return value("Conf/localProxyOwnerId", "").toString();
-}
-
-void SecureAppSettingsRepository::setLocalProxyOwnerId(const QString &serverId)
-{
-    setValue("Conf/localProxyOwnerId", serverId);
-    emit localProxySettingsChanged();
-}
-
-quint16 SecureAppSettingsRepository::localProxyPort() const
-{
-    return static_cast<quint16>(value("Conf/localProxyPort", 10808).toUInt());
-}
-
-void SecureAppSettingsRepository::setLocalProxyPort(quint16 port)
-{
-    setValue("Conf/localProxyPort", port);
-    emit localProxySettingsChanged();
-}
-
-bool SecureAppSettingsRepository::isLocalProxyPortUserDefined() const
-{
-    return value("Conf/localProxyPortUserDefined", false).toBool();
-}
-
-void SecureAppSettingsRepository::setLocalProxyPortUserDefined(bool userDefined)
-{
-    setValue("Conf/localProxyPortUserDefined", userDefined);
-}
-
-bool SecureAppSettingsRepository::isLocalProxyHttpEnabled() const
-{
-    return value("Conf/localProxyHttpEnabled", false).toBool();
-}
-
-void SecureAppSettingsRepository::setLocalProxyHttpEnabled(bool enabled)
-{
-    setValue("Conf/localProxyHttpEnabled", enabled);
-    emit localProxySettingsChanged();
-}
-
-int SecureAppSettingsRepository::localProxyRestartToken() const
-{
-    return value("Conf/localProxyRestartToken", 0).toInt();
-}
-
-void SecureAppSettingsRepository::bumpLocalProxyRestartToken()
-{
-    const int current = localProxyRestartToken();
-    const int next = (current == std::numeric_limits<int>::max()) ? 0 : (current + 1);
-    setValue("Conf/localProxyRestartToken", next);
-    emit localProxySettingsChanged();
-}

client/core/repositories/secureAppSettingsRepository.h

@@ -93,18 +93,6 @@ public:
     QByteArray xraySavedConfigs() const;
     void setXraySavedConfigs(const QByteArray &data);
 
-    // Local proxy
-    QString localProxyOwnerId() const;
-    void setLocalProxyOwnerId(const QString &serverId);
-    quint16 localProxyPort() const;
-    void setLocalProxyPort(quint16 port);
-    bool isLocalProxyPortUserDefined() const;
-    void setLocalProxyPortUserDefined(bool userDefined);
-    bool isLocalProxyHttpEnabled() const;
-    void setLocalProxyHttpEnabled(bool enabled);
-    int localProxyRestartToken() const;
-    void bumpLocalProxyRestartToken();
-
 signals:
     void appLanguageChanged(QLocale locale);
     void allowedDnsServersChanged(const QStringList &servers);
@@ -118,8 +106,6 @@ signals:
     void saveLogsChanged(bool enabled);
     void screenshotsEnabledChanged(bool enabled);
     void settingsCleared();
-    void localProxySettingsChanged();
-    void localProxyStartFailed(const QString &message);
 
 private:
     void setVpnSites(RouteMode mode, const QVariantMap &sites);

client/core/repositories/secureServersRepository.cpp

@@ -309,15 +309,6 @@ serverConfigUtils::ConfigType SecureServersRepository::serverKind(const QString
     return serverConfigUtils::configTypeFromJson(withoutStorageServerId(it.value()));
 }
 
-std::optional<QJsonObject> SecureServersRepository::serverJsonById(const QString &serverId) const
-{
-    const auto it = m_serverJsonById.constFind(serverId);
-    if (it == m_serverJsonById.constEnd()) {
-        return std::nullopt;
-    }
-    return it.value();
-}
-
 std::optional<SelfHostedAdminServerConfig> SecureServersRepository::selfHostedAdminConfig(const QString &serverId) const
 {
     const auto it = m_serverJsonById.constFind(serverId);

client/core/repositories/secureServersRepository.h

@@ -31,8 +31,6 @@ public:
     void removeServer(const QString &serverId);
     serverConfigUtils::ConfigType serverKind(const QString &serverId) const;
 
-    std::optional<QJsonObject> serverJsonById(const QString &serverId) const;
-
     std::optional<SelfHostedAdminServerConfig> selfHostedAdminConfig(const QString &serverId) const;
     std::optional<SelfHostedUserServerConfig> selfHostedUserConfig(const QString &serverId) const;
     std::optional<NativeServerConfig> nativeConfig(const QString &serverId) const;

client/server_scripts/remove_all_containers.sh

@@ -1,5 +1,6 @@
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
 sudo docker images -a --format table | grep amnezia | awk '{print $3, $1 ":" $2}' | xargs sudo docker rmi;\
+sudo docker volume ls | grep amnezia | awk '{print $2}' | xargs sudo docker volume rm -f;\
 sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
 sudo rm -frd /opt/amnezia

client/server_scripts/remove_container.sh

@@ -1,4 +1,3 @@
 sudo docker stop $CONTAINER_NAME;\
 sudo docker rm -fv $CONTAINER_NAME;\
-sudo docker rmi $CONTAINER_NAME;\
-test "$REMOVE_CONTAINER_DATA" = "1" && sudo docker volume rm -f ${CONTAINER_NAME}-data 2>/dev/null || true
+sudo docker rmi $CONTAINER_NAME;

client/ui/controllers/qml/pageController.h

@@ -45,8 +45,6 @@ namespace PageLoader
         PageSettingsApiDevices,
         PageSettingsApiSubscriptionKey,
         PageSettingsKillSwitchExceptions,
-        PageSettingsConnectionType,
-        PageSettingsLocalProxy,
 
         PageServiceSftpSettings,
         PageServiceTorWebsiteSettings,

client/ui/controllers/settingsUiController.cpp

@@ -39,11 +39,6 @@ SettingsUiController::SettingsUiController(SettingsController* settingsControlle
     if (m_settingsController->isDevGatewayEnv()) {
         m_settingsController->enableDevMode();
     }
-
-    connect(m_settingsController, &SettingsController::localProxySettingsUpdated, this,
-            &SettingsUiController::localProxySettingsUpdated);
-    connect(m_settingsController, &SettingsController::localProxyStartFailed, this,
-            &SettingsUiController::localProxyStartFailed);
 }
 
 void SettingsUiController::toggleAmneziaDns(bool enable)
@@ -365,53 +360,3 @@ void SettingsUiController::disableHomeAdLabel()
     m_settingsController->disableHomeAdLabel();
     emit isHomeAdLabelVisibleChanged(false);
 }
-
-bool SettingsUiController::isLocalProxySupported() const
-{
-    return m_settingsController->isLocalProxySupported();
-}
-
-bool SettingsUiController::isLocalProxyHttpEnabled() const
-{
-    return m_settingsController->isLocalProxyHttpEnabled();
-}
-
-int SettingsUiController::localProxyPort() const
-{
-    return m_settingsController->localProxyPort();
-}
-
-QString SettingsUiController::localProxyOwnerId() const
-{
-    return m_settingsController->localProxyOwnerId();
-}
-
-bool SettingsUiController::setLocalProxyPort(int port)
-{
-    return m_settingsController->setLocalProxyPort(port);
-}
-
-bool SettingsUiController::isLocalProxyPortBusy(int port) const
-{
-    return m_settingsController->isLocalProxyPortBusy(port);
-}
-
-bool SettingsUiController::isLocalProxyPortUserDefined() const
-{
-    return m_settingsController->isLocalProxyPortUserDefined();
-}
-
-int SettingsUiController::findFirstAvailableLocalProxyPort(int startPort) const
-{
-    return m_settingsController->findFirstAvailableLocalProxyPort(startPort);
-}
-
-bool SettingsUiController::enableLocalProxy(const QString &ownerId, int port)
-{
-    return m_settingsController->enableLocalProxy(ownerId, port);
-}
-
-void SettingsUiController::disableLocalProxy()
-{
-    m_settingsController->disableLocalProxy();
-}

client/ui/controllers/settingsUiController.h

@@ -33,10 +33,6 @@ public:
 
     Q_PROPERTY(bool isHomeAdLabelVisible READ isHomeAdLabelVisible NOTIFY isHomeAdLabelVisibleChanged)
     Q_PROPERTY(bool startMinimized READ isStartMinimizedEnabled NOTIFY startMinimizedChanged)
-    Q_PROPERTY(bool isLocalProxySupported READ isLocalProxySupported CONSTANT)
-    Q_PROPERTY(bool isLocalProxyHttpEnabled READ isLocalProxyHttpEnabled NOTIFY localProxySettingsUpdated)
-    Q_PROPERTY(int localProxyPort READ localProxyPort WRITE setLocalProxyPort NOTIFY localProxySettingsUpdated)
-    Q_PROPERTY(QString localProxyOwnerId READ localProxyOwnerId NOTIFY localProxySettingsUpdated)
 
 public slots:
     void toggleAmneziaDns(bool enable);
@@ -107,17 +103,6 @@ public slots:
     bool isHomeAdLabelVisible();
     void disableHomeAdLabel();
 
-    bool isLocalProxySupported() const;
-    bool isLocalProxyHttpEnabled() const;
-    int localProxyPort() const;
-    QString localProxyOwnerId() const;
-    bool setLocalProxyPort(int port);
-    bool isLocalProxyPortBusy(int port) const;
-    bool isLocalProxyPortUserDefined() const;
-    int findFirstAvailableLocalProxyPort(int startPort) const;
-    bool enableLocalProxy(const QString &ownerId, int port);
-    void disableLocalProxy();
-
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
@@ -151,8 +136,6 @@ signals:
 
     void isHomeAdLabelVisibleChanged(bool visible);
     void startMinimizedChanged();
-    void localProxySettingsUpdated();
-    void localProxyStartFailed(const QString &message);
 
 private:
     SettingsController* m_settingsController;

client/ui/models/serversModel.cpp

@@ -152,3 +152,4 @@ ServerCredentials ServersModel::serverCredentials(int index) const
     }
     return m_descriptions.at(index).selfHostedSshCredentials;
 }
+

client/ui/models/serversModel.h

@@ -10,7 +10,6 @@
 class ServersModel : public QAbstractListModel
 {
     Q_OBJECT
-
 public:
     enum Roles {
         NameRole = Qt::UserRole + 1,

client/ui/qml/Controls2/BaseHeaderType.qml

@@ -12,7 +12,6 @@ Item {
     property int headerTextMaximumLineCount: 2
     property int headerTextElide: Qt.ElideRight
     property string descriptionText
-    property string descriptionColor: AmneziaStyle.color.mutedGray
     property string descriptionLinkText
     property string descriptionLinkUrl
     property alias headerRow: headerRow
@@ -43,7 +42,7 @@ Item {
             Layout.topMargin: 16
             Layout.fillWidth: true
             text: root.descriptionText
-            color: root.descriptionColor
+            color: AmneziaStyle.color.mutedGray
             visible: root.descriptionText !== ""
         }
 

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -15,7 +15,6 @@ Item {
     property string headerTextColor: AmneziaStyle.color.mutedGray
 
     property alias errorText: errorField.text
-    property bool clearErrorOnTextChanged: true
     property bool checkEmptyText: false
     property bool rightButtonClickedOnEnter: false
 
@@ -136,9 +135,7 @@ Item {
                         }
 
                         onTextChanged: {
-                            if (root.clearErrorOnTextChanged) {
-                                root.errorText = ""
-                            }
+                            root.errorText = ""
                         }
 
                         onActiveFocusChanged: {

client/ui/qml/Pages2/PageProtocolXrayFlowSettings.qml

@@ -112,7 +112,7 @@ PageType {
                     return
                 }
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
             }
             var noButtonFunction = function () {
                 if (typeof GC !== "undefined" && !GC.isMobile()) {

client/ui/qml/Pages2/PageProtocolXraySecuritySettings.qml

@@ -279,7 +279,7 @@ PageType {
                     return
                 }
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
             }
             var noButtonFunction = function () {
                 if (typeof GC !== "undefined" && !GC.isMobile()) {

client/ui/qml/Pages2/PageProtocolXraySettings.qml

@@ -17,6 +17,10 @@ import "../Components"
 PageType {
     id: root
 
+    enableTimer: false
+
+    property bool portDirty: false
+
     function formatTransport(value) {
         if (value === "raw") return "RAW (TCP)"
         if (value === "xhttp") return "XHTTP"
@@ -39,8 +43,8 @@ PageType {
         anchors.right: parent.right
         anchors.topMargin: 20 + PageController.safeAreaTopMargin
 
-        onFocusChanged: {
-            if (this.activeFocus) {
+        onActiveFocusChanged: {
+            if (backButton.enabled && backButton.activeFocus) {
                 listView.positionViewAtBeginning()
             }
         }
@@ -60,8 +64,6 @@ PageType {
         delegate: ColumnLayout {
             width: listView.width
 
-            property alias focusItemId: textFieldWithHeaderType.textField
-
             spacing: 0
 
             Text {
@@ -107,13 +109,32 @@ PageType {
                 Layout.rightMargin: 16
                 enabled: listView.enabled
                 headerText: qsTr("Port")
-                textField.text: port
+
+                Binding {
+                    target: textFieldWithHeaderType.textField
+                    property: "text"
+                    value: port
+                    when: !textFieldWithHeaderType.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
+                }
+
                 textField.maximumLength: 5
                 textField.validator: IntValidator {
                     bottom: 1; top: 65535
                 }
+                textField.onActiveFocusChanged: {
+                    if (textField.activeFocus && textField.text === "" && port !== "") {
+                        textField.text = port
+                    }
+                }
+                textField.onTextChanged: {
+                    root.portDirty = (textField.text !== port)
+                }
                 textField.onEditingFinished: {
-                    if (textField.text !== port) port = textField.text
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                    root.portDirty = false
                 }
                 checkEmptyText: true
             }
@@ -172,9 +193,8 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
                 visible: listView.enabled
-                         && (XrayConfigModel.hasUnsavedChanges
-                             || textFieldWithHeaderType.textField.text !== port)
-                enabled: visible && textFieldWithHeaderType.errorText === ""
+                         && (XrayConfigModel.hasUnsavedChanges || root.portDirty)
+                enabled: visible && textFieldWithHeaderType.textField.text !== ""
                 text: qsTr("Save")
                 onClicked: function() {
                     forceActiveFocus()

client/ui/qml/Pages2/PageProtocolXrayTransportSettings.qml

@@ -742,7 +742,7 @@ PageType {
                     return
                 }
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
             }
             var noButtonFunction = function () {
                 if (typeof GC !== "undefined" && !GC.isMobile()) {

client/ui/qml/Pages2/PageProtocolXrayXPaddingBytesSettings.qml

@@ -95,7 +95,7 @@ PageType {
                     return
                 }
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
             }
             var noButtonFunction = function () {
                 if (typeof GC !== "undefined" && !GC.isMobile()) {

client/ui/qml/Pages2/PageProtocolXrayXPaddingSettings.qml

@@ -211,7 +211,7 @@ PageType {
                     return
                 }
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
             }
             var noButtonFunction = function () {
                 if (typeof GC !== "undefined" && !GC.isMobile()) {

client/ui/qml/Pages2/PageProtocolXrayXmuxSettings.qml

@@ -208,7 +208,7 @@ PageType {
                     return
                 }
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
             }
             var noButtonFunction = function () {
                 if (typeof GC !== "undefined" && !GC.isMobile()) {

client/ui/qml/Pages2/PageSettingsApiServerInfo.qml

@@ -319,28 +319,12 @@ PageType {
                 }
             }
 
-            LabelWithButtonType {
-                id: connectionSwitcher
-
-                Layout.fillWidth: true
-                Layout.topMargin: warning.visible ? 16 : 0
-                text: qsTr("Connection")
-                descriptionText: SettingsController.isLocalProxySupported
-                                  ? qsTr("Protocol selection and local proxy setup")
-                                  : qsTr("Protocol selection")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsConnectionType)
-                }
-            }
-
-            DividerType {}
-
             LabelWithButtonType {
                 id: vpnKey
 
                 Layout.fillWidth: true
+                Layout.topMargin: warning.visible ? 16 : 0
+
                 visible: footer.isVisibleForAmneziaFree
 
                 text: qsTr("Subscription Key")

client/ui/qml/Pages2/PageSettingsConnectionType.qml

@@ -1,98 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-import Style 1.0
-
-import "./"
-import "../Controls2"
-import "../Config"
-
-PageType {
-    id: root
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20 + PageController.safeAreaTopMargin
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
-    }
-
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        header: ColumnLayout {
-            width: listView.width
-
-            BaseHeaderType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                headerText: qsTr("Connection")
-            }
-        }
-
-        model: 1
-
-        delegate: ColumnLayout {
-            width: listView.width
-
-            LabelWithButtonType {
-                id: vpnProtocolButton
-
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                text: qsTr("VPN protocol")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsServerProtocols)
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: localProxyButton
-
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                visible: SettingsController.isLocalProxySupported && ServersUiController.processedServerIsPremium
-                Layout.preferredHeight: visible ? implicitHeight : 0
-
-                text: qsTr("Local proxy")
-                descriptionText: SettingsController.isLocalProxyHttpEnabled ? qsTr("Running: 127.0.0.1:%1").arg(SettingsController.localProxyPort || 0)
-                                                                            : qsTr("Off")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsLocalProxy)
-                }
-            }
-
-            DividerType {
-                visible: SettingsController.isLocalProxySupported
-                Layout.preferredHeight: visible ? implicitHeight : 0
-            }
-        }
-    }
-}

client/ui/qml/Pages2/PageSettingsLocalProxy.qml

@@ -1,426 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-import Style 1.0
-
-import "./"
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-
-PageType {
-    id: root
-
-    readonly property int localProxyPortMin: 1024
-    readonly property int localProxyPortMax: 65535
-    readonly property int defaultLocalProxyPort: 10808
-
-    property string portValidationError: ""
-    property int pendingStartRequestedPort: -1
-    property int pendingStartAutoSelectedPort: -1
-    property bool pendingStartVpnWasActive: false
-    property bool pendingEnableAfterVpnDisconnect: false
-    property string pendingEnableServerId: ""
-    property int pendingEnableRequestedPort: -1
-    property int pendingEnableAutoSelectedPort: -1
-    property int pendingEnablePortToUse: -1
-
-    function clearPendingEnableAfterVpnDisconnect() {
-        root.pendingEnableAfterVpnDisconnect = false
-        root.pendingEnableServerId = ""
-        root.pendingEnableRequestedPort = -1
-        root.pendingEnableAutoSelectedPort = -1
-        root.pendingEnablePortToUse = -1
-    }
-
-    function enableLocalProxyNow(serverId, requestedPort, autoSelectedPort, portToEnable, vpnWasActive) {
-        if (!SettingsController.enableLocalProxy(serverId, portToEnable)) {
-            PageController.showNotificationMessage(qsTr("Failed to enable local proxy. Check the port (%1-%2).")
-                .arg(root.localProxyPortMin)
-                .arg(root.localProxyPortMax))
-            return false
-        }
-
-        root.pendingStartRequestedPort = requestedPort
-        root.pendingStartAutoSelectedPort = autoSelectedPort
-        root.pendingStartVpnWasActive = vpnWasActive
-        startSuccessToastTimer.restart()
-        return true
-    }
-
-    function getPortField() {
-        var item = listView.itemAtIndex(0)
-        return item !== null ? item.children[0] : null
-    }
-
-    function computePortErrorText() {
-        var portField = getPortField()
-        if (portField === null) return ""
-        const text = portField.textField.text.trim()
-        if (text === "") {
-            return qsTr("Enter a port")
-        }
-        const value = parseInt(text)
-        if (isNaN(value) || value < root.localProxyPortMin || value > root.localProxyPortMax) {
-            return qsTr("Port must be between %1 and %2")
-                .arg(root.localProxyPortMin)
-                .arg(root.localProxyPortMax)
-        }
-        if (SettingsController.isLocalProxyPortBusy(value)) {
-            return qsTr("Port %1 is already in use on this device. Choose another one")
-                .arg(value)
-        }
-        return ""
-    }
-
-    function handleLocalProxyToggle(checked) {
-        if (checked) {
-            if (!ServersUiController.processedServerIsPremium) {
-                PageController.showNotificationMessage(qsTr("Local proxy is available only for Amnezia Premium"))
-                return
-            }
-            const wasVpnActive = ConnectionController.isConnected || ConnectionController.isConnectionInProgress
-
-            let serverId = ServersUiController.processedServerId
-            if (!serverId) {
-                serverId = ServersUiController.defaultServerId
-            }
-            if (!serverId) {
-                PageController.showNotificationMessage(qsTr("Unable to determine the current server"))
-                return
-            }
-
-            if (SettingsController.isLocalProxyHttpEnabled
-                    && SettingsController.localProxyOwnerId
-                    && SettingsController.localProxyOwnerId !== serverId) {
-                PageController.showNotificationMessage(qsTr("Local proxy is already enabled for another server"))
-                return
-            }
-
-            const requestedPort = SettingsController.localProxyPort
-            if (requestedPort < root.localProxyPortMin || requestedPort > root.localProxyPortMax) {
-                PageController.showNotificationMessage(qsTr("Port must be between %1 and %2")
-                    .arg(root.localProxyPortMin)
-                    .arg(root.localProxyPortMax))
-                return
-            }
-
-            let autoSelectedPort = -1
-            if (SettingsController.isLocalProxyPortBusy(requestedPort)) {
-                if (SettingsController.isLocalProxyPortUserDefined()
-                        || requestedPort !== root.defaultLocalProxyPort) {
-                    PageController.showNotificationMessage(qsTr("Port %1 is already in use on this device. Choose another one")
-                        .arg(requestedPort))
-                    return
-                }
-
-                autoSelectedPort = SettingsController.findFirstAvailableLocalProxyPort(root.defaultLocalProxyPort + 1)
-                if (autoSelectedPort <= 0) {
-                    PageController.showNotificationMessage(qsTr("Port %1 is already in use on this device. Choose another one")
-                        .arg(requestedPort))
-                    return
-                }
-            }
-
-            const portToEnable = autoSelectedPort > 0 ? autoSelectedPort : requestedPort
-            if (wasVpnActive) {
-                root.pendingEnableAfterVpnDisconnect = true
-                root.pendingEnableServerId = serverId
-                root.pendingEnableRequestedPort = requestedPort
-                root.pendingEnableAutoSelectedPort = autoSelectedPort
-                root.pendingEnablePortToUse = portToEnable
-                ConnectionController.closeConnection()
-                return
-            }
-
-            root.enableLocalProxyNow(serverId, requestedPort, autoSelectedPort, portToEnable, false)
-        } else {
-            startSuccessToastTimer.stop()
-            root.clearPendingEnableAfterVpnDisconnect()
-            root.pendingStartRequestedPort = -1
-            root.pendingStartAutoSelectedPort = -1
-            root.pendingStartVpnWasActive = false
-            SettingsController.disableLocalProxy()
-            PageController.showNotificationMessage(qsTr("Local proxy stopped"))
-        }
-    }
-
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20 + PageController.safeAreaTopMargin
-
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
-    }
-
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        header: ColumnLayout {
-            width: listView.width
-
-            HeaderTypeWithSwitcher {
-                id: localProxyHeader
-
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                headerText: qsTr("Local Proxy")
-                descriptionText: qsTr("Use a proxy to route selected apps (for example, the CensorTracker extension) through Amnezia Premium.")
-                showSwitcher: ServersUiController.processedServerIsPremium
-                switcher {
-                    checked: SettingsController.isLocalProxyHttpEnabled
-                }
-                switcherFunction: function(checked) {
-                    // Ignore UI sync toggles; react only to real state change intent.
-                    if (checked === SettingsController.isLocalProxyHttpEnabled) {
-                        return
-                    }
-                    root.handleLocalProxyToggle(checked)
-                    // Keep checked declaratively linked after any user interaction path.
-                    localProxyHeader.switcher.checked = Qt.binding(function() {
-                        return SettingsController.isLocalProxyHttpEnabled
-                    })
-                }
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.topMargin: 12
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                color: localProxyHeader.descriptionColor
-                text: qsTr("Only one can be on at a time: VPN or local proxy.")
-            }
-
-            BasicButtonType {
-                Layout.topMargin: 8
-                Layout.leftMargin: 8
-                Layout.bottomMargin: 28
-                implicitHeight: 32
-
-                defaultColor: AmneziaStyle.color.transparent
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
-                disabledColor: AmneziaStyle.color.mutedGray
-                textColor: AmneziaStyle.color.goldenApricot
-
-                text: qsTr("Learn more")
-                clickedFunc: function() {
-                    const path = LanguageModel.currentLanguageName === "Русский"
-                        ? "ru/documentation/instructions/local-proxy"
-                        : "documentation/instructions/local-proxy"
-                    Qt.openUrlExternally(LanguageModel.getCurrentDocsUrl(path))
-                }
-            }
-        }
-
-        model: 1 // fake model to force the ListView to be created without a model
-
-        delegate: ColumnLayout {
-            width: listView.width
-            spacing: 16
-
-            TextFieldWithHeaderType {
-                id: portField
-
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                headerText: qsTr("Address and port")
-                buttonText: qsTr("Copy")
-                errorText: root.portValidationError
-                clearErrorOnTextChanged: false
-
-                enabled: true
-                rightButtonClickedOnEnter: false
-
-                clickedFunc: function() {
-                    const portText = portField.effectivePortText()
-                    GC.copyToClipBoard("127.0.0.1:" + portText)
-                    PageController.showNotificationMessage(qsTr("Copied: 127.0.0.1:%1").arg(portText))
-                }
-
-                textField.validator: RegularExpressionValidator {
-                    regularExpression: /^[0-9]{0,5}$/
-                }
-                textField.leftPadding: portPrefix.implicitWidth
-                textField.placeholderText: root.defaultLocalProxyPort.toString()
-                textField.inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoPredictiveText
-
-                function syncPortValue() {
-                    const port = SettingsController.localProxyPort
-                    const isValidPort = port >= root.localProxyPortMin && port <= root.localProxyPortMax
-                    textField.text = isValidPort ? port.toString() : ""
-                }
-
-                function portValue() {
-                    const value = parseInt(textField.text)
-                    return isNaN(value) ? -1 : value
-                }
-
-                function effectivePortText() {
-                    const value = portValue()
-                    if (value >= root.localProxyPortMin && value <= root.localProxyPortMax) {
-                        return value.toString()
-                    }
-                    const fallback = SettingsController.localProxyPort
-                    if (fallback >= root.localProxyPortMin && fallback <= root.localProxyPortMax) {
-                        return fallback.toString()
-                    }
-                    return root.defaultLocalProxyPort.toString()
-                }
-
-                Component.onCompleted: syncPortValue()
-
-                textField.onTextChanged: {
-                    if (textField.activeFocus) {
-                        root.portValidationError = ""
-                    }
-                }
-            }
-
-            Text {
-                id: portPrefix
-
-                parent: portField.textField
-                text: "127.0.0.1:"
-                color: AmneziaStyle.color.paleGray
-                font.pixelSize: portField.textField.font.pixelSize
-                font.weight: portField.textField.font.weight
-                font.family: portField.textField.font.family
-                z: 1
-
-                anchors.left: parent.left
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                text: qsTr("Save")
-                enabled: true
-
-                clickedFunc: function() {
-                    if (SettingsController.isLocalProxyHttpEnabled) {
-                        PageController.showNotificationMessage(qsTr("Disable Local Proxy to change the port"))
-                        return
-                    }
-                    const validationError = root.computePortErrorText()
-                    root.portValidationError = validationError
-                    if (validationError !== "") {
-                        return
-                    }
-
-                    const value = portField.portValue()
-                    if (!SettingsController.setLocalProxyPort(value)) {
-                        PageController.showNotificationMessage(qsTr("Failed to save port. Valid range: %1-%2")
-                            .arg(root.localProxyPortMin)
-                            .arg(root.localProxyPortMax))
-                    } else {
-                        PageController.showNotificationMessage(qsTr("Port saved: %1").arg(value))
-                    }
-                    portField.syncPortValue()
-                }
-            }
-        }
-    }
-
-    Timer {
-        id: startSuccessToastTimer
-        interval: 250
-        repeat: false
-        running: false
-        onTriggered: {
-            if (!SettingsController.isLocalProxyHttpEnabled) {
-                return
-            }
-
-            if (root.pendingStartAutoSelectedPort > 0) {
-                PageController.showNotificationMessage(qsTr("Port %1 is in use — selected free port %2.")
-                    .arg(root.defaultLocalProxyPort)
-                    .arg(root.pendingStartAutoSelectedPort))
-            } else if (root.pendingStartVpnWasActive && root.pendingStartRequestedPort > 0) {
-                PageController.showNotificationMessage(qsTr("VPN turned off. Local proxy is running: 127.0.0.1:%1")
-                    .arg(root.pendingStartRequestedPort))
-            } else if (root.pendingStartRequestedPort > 0) {
-                PageController.showNotificationMessage(qsTr("Local proxy is running: 127.0.0.1:%1")
-                    .arg(root.pendingStartRequestedPort))
-            }
-
-            root.pendingStartRequestedPort = -1
-            root.pendingStartAutoSelectedPort = -1
-            root.pendingStartVpnWasActive = false
-        }
-    }
-
-    Connections {
-        target: ConnectionController
-
-        function onConnectionStateChanged() {
-            if (!root.pendingEnableAfterVpnDisconnect) {
-                return
-            }
-
-            if (ConnectionController.isConnected || ConnectionController.isConnectionInProgress) {
-                return
-            }
-
-            const serverId = root.pendingEnableServerId
-            const requestedPort = root.pendingEnableRequestedPort
-            const autoSelectedPort = root.pendingEnableAutoSelectedPort
-            const portToEnable = root.pendingEnablePortToUse
-            root.clearPendingEnableAfterVpnDisconnect()
-
-            root.enableLocalProxyNow(serverId, requestedPort, autoSelectedPort, portToEnable, true)
-        }
-    }
-
-    Connections {
-        target: SettingsController
-
-        function onLocalProxySettingsUpdated() {
-            var portField = root.getPortField()
-            if (portField !== null && !portField.textField.activeFocus) {
-                portField.syncPortValue()
-            }
-        }
-
-        function onLocalProxyStartFailed(message) {
-            startSuccessToastTimer.stop()
-            root.pendingStartRequestedPort = -1
-            root.pendingStartAutoSelectedPort = -1
-            root.pendingStartVpnWasActive = false
-            PageController.showNotificationMessage(message)
-        }
-    }
-
-    Connections {
-        target: ServersUiController
-
-        function onProcessedServerIdChanged() {
-            var portField = root.getPortField()
-            if (portField !== null && !portField.textField.activeFocus) {
-                portField.syncPortValue()
-            }
-        }
-    }
-}

client/ui/qml/qml.qrc

@@ -105,8 +105,6 @@
         <file>Pages2/PageSettingsDns.qml</file>
         <file>Pages2/PageSettingsKillSwitch.qml</file>
         <file>Pages2/PageSettingsKillSwitchExceptions.qml</file>
-        <file>Pages2/PageSettingsConnectionType.qml</file>
-        <file>Pages2/PageSettingsLocalProxy.qml</file>
         <file>Pages2/PageSettingsLogging.qml</file>
         <file>Pages2/PageSettingsServerData.qml</file>
         <file>Pages2/PageSettingsServerInfo.qml</file>

recipes/openvpnadapter/conanfile.py

@@ -5,6 +5,7 @@ from conan.errors import ConanInvalidConfiguration
 from conan.tools.scm import Git
 from conan.internal.model.pkg_type import PackageType
 from conan.tools.files import chdir
+from conan.tools.apple import XCRun
 
 import os
 import shutil
@@ -49,7 +50,10 @@ class OpenVPNAdapter(ConanFile):
 
     def build(self):
         with chdir(self, self.source_folder):
-            self.run("xcrun xcodebuild"
+            xcrun = XCRun(self)
+
+            xcodebuild = xcrun.find("xcodebuild")
+            self.run(f"{xcodebuild}"
                 " -project OpenVPNAdapter.xcodeproj"
                 " -scheme OpenVPNAdapter"
                 " -configuration Release"
@@ -57,10 +61,20 @@ class OpenVPNAdapter(ConanFile):
                 f" -sdk {self._sdk}"
                 f' "CONFIGURATION_BUILD_DIR={self.build_folder}"'
                 f' "BUILT_PRODUCTS_DIR={self.build_folder}"'
+                " MACH_O_TYPE=staticlib"
                 " BUILD_LIBRARY_FOR_DISTRIBUTION=YES"
                 " CODE_SIGNING_ALLOWED=NO"
             )
 
+            openvpnadapter = os.path.join(self.build_folder, "OpenVPNAdapter.framework", "OpenVPNAdapter")
+            self.run(f"{xcrun.libtool} -static -o"
+                     f" {openvpnadapter}"
+                     f" {openvpnadapter}"
+                     f' {os.path.join(self.build_folder, "OpenVPNClient.framework", "OpenVPNClient")}'
+                     f' {os.path.join(self.build_folder, "LZ4.framework", "LZ4")}'
+                     f' {os.path.join(self.build_folder, "mbedTLS.framework", "mbedTLS")}'
+            )
+
     def package(self):
         shutil.copytree(os.path.join(self.build_folder, "OpenVPNAdapter.framework"),
                         os.path.join(self.package_folder, "OpenVPNAdapter.framework"))
@@ -70,3 +84,4 @@ class OpenVPNAdapter(ConanFile):
         self.cpp_info.type = PackageType.STATIC
         self.cpp_info.package_framework = True
         self.cpp_info.location = os.path.join(self.package_folder, "OpenVPNAdapter.framework")
+        self.cpp_info.frameworks = ["SystemConfiguration"]