Open docs url according for Ukrainian language

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.6.0.1
+project(${PROJECT} VERSION 4.5.3.0
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 54)
+set(APP_ANDROID_VERSION_CODE 52)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

README.md

@@ -9,7 +9,7 @@ Amnezia is an open-source VPN client, with a key feature that enables you to dep
 ## Features
 
 - Very easy to use - enter your IP address, SSH login, and password, and Amnezia will automatically install VPN docker containers to your server and connect to the VPN.
-- OpenVPN, Shadowsocks, WireGuard, and IKEv2 protocols support.
+- OpenVPN, ShadowSocks, WireGuard, and IKEv2 protocols support.
 - Masking VPN with OpenVPN over Cloak plugin
 - Split tunneling support - add any sites to the client to enable VPN only for them (only for desktops)
 - Windows, MacOS, Linux, Android, iOS releases.
@@ -27,7 +27,7 @@ AmneziaVPN uses several open-source projects to work:
 
 - [OpenSSL](https://www.openssl.org/)
 - [OpenVPN](https://openvpn.net/)
-- [Shadowsocks](https://shadowsocks.org/)
+- [ShadowSocks](https://shadowsocks.org/)
 - [Qt](https://www.qt.io/)
 - [LibSsh](https://libssh.org) - forked from Qt Creator
 - and more...

client/3rd/QJsonStruct/.gitignore

@@ -1,2 +0,0 @@
-*.user
-build/

client/3rd/QJsonStruct/CMakeLists.txt

@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-
-project(QJsonStruct LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-option(BUILD_TESTING ON)
-
-include(QJsonStruct.cmake)
-find_package(Qt5 COMPONENTS Core REQUIRED)
-
-if(BUILD_TESTING)
-    include(CTest)
-    add_subdirectory(test)
-endif()

client/3rd/QJsonStruct/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Qv2ray Workgroup
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

client/3rd/QJsonStruct/QJsonIO.hpp

@@ -1,190 +0,0 @@
-#pragma once
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QList>
-#include <tuple>
-
-enum class QJsonIOPathType
-{
-    JSONIO_MODE_ARRAY,
-    JSONIO_MODE_OBJECT
-};
-
-typedef QPair<QString, QJsonIOPathType> QJsonIONodeType;
-
-struct QJsonIOPath : QList<QJsonIONodeType>
-{
-    template<typename type1, typename type2, typename... types>
-    QJsonIOPath(const type1 t1, const type2 t2, const types... ts)
-    {
-        AppendPath(t1);
-        AppendPath(t2);
-        (AppendPath(ts), ...);
-    }
-
-    void AppendPath(size_t index)
-    {
-        append({ QString::number(index), QJsonIOPathType::JSONIO_MODE_ARRAY });
-    }
-
-    void AppendPath(const QString &key)
-    {
-        append({ key, QJsonIOPathType::JSONIO_MODE_OBJECT });
-    }
-
-    template<typename t>
-    QJsonIOPath &operator<<(const t &str)
-    {
-        AppendPath(str);
-        return *this;
-    }
-
-    template<typename t>
-    QJsonIOPath &operator+=(const t &val)
-    {
-        AppendPath(val);
-        return *this;
-    }
-
-    QJsonIOPath &operator<<(const QJsonIOPath &other)
-    {
-        for (const auto &x : other)
-            this->append(x);
-        return *this;
-    }
-
-    template<typename t>
-    QJsonIOPath &operator<<(const t &val) const
-    {
-        auto _new = *this;
-        return _new << val;
-    }
-
-    template<typename t>
-    QJsonIOPath operator+(const t &val) const
-    {
-        auto _new = *this;
-        return _new << val;
-    }
-
-    QJsonIOPath operator+(const QJsonIOPath &other) const
-    {
-        auto _new = *this;
-        for (const auto &x : other)
-            _new.append(x);
-        return _new;
-    }
-};
-
-class QJsonIO
-{
-  public:
-    const static inline QJsonValue Null = QJsonValue::Null;
-    const static inline QJsonValue Undefined = QJsonValue::Undefined;
-
-    template<typename current_key_type, typename... t_other_types>
-    static QJsonValue GetValue(const QJsonValue &parent, const current_key_type &current, const t_other_types &...other)
-    {
-        if constexpr (sizeof...(t_other_types) == 0)
-            if constexpr (std::is_integral_v<current_key_type>)
-                return parent.toArray()[current];
-            else
-                return parent.toObject()[current];
-        else if constexpr (std::is_integral_v<current_key_type>)
-            return GetValue(parent.toArray()[current], other...);
-        else
-            return GetValue(parent.toObject()[current], other...);
-    }
-
-    template<typename... key_types_t>
-    static QJsonValue GetValue(QJsonValue value, const std::tuple<key_types_t...> &keys, const QJsonValue &defaultValue = Undefined)
-    {
-        std::apply([&](auto &&...args) { ((value = value[args]), ...); }, keys);
-        return value.isUndefined() ? defaultValue : value;
-    }
-
-    template<typename parent_type, typename t_value_type, typename current_key_type, typename... t_other_key_types>
-    static void SetValue(parent_type &parent, const t_value_type &val, const current_key_type &current, const t_other_key_types &...other)
-    {
-        // If current parent is an array, increase its size to fit the "key"
-        if constexpr (std::is_integral_v<current_key_type>)
-            for (auto i = parent.size(); i <= current; i++)
-                parent.insert(i, {});
-
-        // If the t_other_key_types has nothing....
-        // Means we have reached the end of recursion.
-        if constexpr (sizeof...(t_other_key_types) == 0)
-            parent[current] = val;
-        else if constexpr (std::is_integral_v<typename std::tuple_element_t<0, std::tuple<t_other_key_types...>>>)
-        {
-            // Means we still have many keys
-            // So this element is an array.
-            auto _array = parent[current].toArray();
-            SetValue(_array, val, other...);
-            parent[current] = _array;
-        }
-        else
-        {
-            auto _object = parent[current].toObject();
-            SetValue(_object, val, other...);
-            parent[current] = _object;
-        }
-    }
-
-    static QJsonValue GetValue(const QJsonValue &parent, const QJsonIOPath &path, const QJsonValue &defaultValue = QJsonIO::Undefined)
-    {
-        QJsonValue val = parent;
-        for (const auto &[k, t] : path)
-        {
-            if (t == QJsonIOPathType::JSONIO_MODE_ARRAY)
-                val = val.toArray()[k.toInt()];
-            else
-                val = val.toObject()[k];
-        }
-        return val.isUndefined() ? defaultValue : val;
-    }
-
-    template<typename parent_type, typename value_type>
-    static void SetValue(parent_type &parent, const value_type &t, const QJsonIOPath &path)
-    {
-        QList<std::tuple<QString, QJsonIOPathType, QJsonValue>> _stack;
-        QJsonValue lastNode = parent;
-        for (const auto &[key, type] : path)
-        {
-            _stack.prepend({ key, type, lastNode });
-            if (type == QJsonIOPathType::JSONIO_MODE_ARRAY)
-                lastNode = lastNode.toArray().at(key.toInt());
-            else
-                lastNode = lastNode.toObject()[key];
-        }
-
-        lastNode = t;
-
-        for (const auto &[key, type, node] : _stack)
-        {
-            if (type == QJsonIOPathType::JSONIO_MODE_ARRAY)
-            {
-                const auto index = key.toInt();
-                auto nodeArray = node.toArray();
-                for (auto i = nodeArray.size(); i <= index; i++)
-                    nodeArray.insert(i, {});
-                nodeArray[index] = lastNode;
-                lastNode = nodeArray;
-            }
-            else
-            {
-                auto nodeObject = node.toObject();
-                nodeObject[key] = lastNode;
-                lastNode = nodeObject;
-            }
-        }
-
-        if constexpr (std::is_same_v<parent_type, QJsonObject>)
-            parent = lastNode.toObject();
-        else if constexpr (std::is_same_v<parent_type, QJsonArray>)
-            parent = lastNode.toArray();
-        else
-            Q_UNREACHABLE();
-    }
-};

client/3rd/QJsonStruct/QJsonStruct.cmake

@@ -1,5 +0,0 @@
-include_directories(${CMAKE_CURRENT_LIST_DIR})
-
-set(QJSONSTRUCT_SOURCES
-    ${CMAKE_CURRENT_LIST_DIR}/QJsonStruct.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/QJsonIO.hpp)

client/3rd/QJsonStruct/QJsonStruct.hpp

@@ -1,215 +0,0 @@
-#pragma once
-#include "macroexpansion.hpp"
-
-#ifndef _X
-    #include <QJsonArray>
-    #include <QJsonObject>
-    #include <QList>
-    #include <QVariant>
-#endif
-
-/// macro to define an operator==
-#define ___JSONSTRUCT_DEFAULT_COMPARE_IMPL(x) (this->x == ___another___instance__.x) &&
-#define JSONSTRUCT_COMPARE(CLASS, ...)                                                                                                               \
-    bool operator==(const CLASS &___another___instance__) const                                                                                      \
-    {                                                                                                                                                \
-        return FOR_EACH(___JSONSTRUCT_DEFAULT_COMPARE_IMPL, __VA_ARGS__) true;                                                                       \
-    }
-
-// ============================================================================================
-// Load JSON IMPL
-#define ___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC_IMPL(name) name::loadJson(___json_object_);
-#define ___DESERIALIZE_FROM_JSON_CONVERT_A_FUNC(name) ___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC(name)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC(...) FOREACH_CALL_FUNC_3(___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC_IMPL, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC(name)                                                                                                \
-    if (___json_object_.toObject().contains(#name))                                                                                                  \
-    {                                                                                                                                                \
-        JsonStructHelper::Deserialize(this->name, ___json_object_.toObject()[#name]);                                                                \
-    }                                                                                                                                                \
-    else                                                                                                                                             \
-    {                                                                                                                                                \
-        this->name = ___qjsonstruct_default_check.name;                                                                                              \
-    }
-
-// ============================================================================================
-// To JSON IMPL
-#define ___SERIALIZE_TO_JSON_CONVERT_F_FUNC(name)                                                                                                    \
-    if (!(___qjsonstruct_default_check.name == this->name))                                                                                          \
-    {                                                                                                                                                \
-        ___json_object_.insert(#name, JsonStructHelper::Serialize(name));                                                                            \
-    }
-#define ___SERIALIZE_TO_JSON_CONVERT_A_FUNC(name) ___json_object_.insert(#name, JsonStructHelper::Serialize(name));
-#define ___SERIALIZE_TO_JSON_CONVERT_B_FUNC_IMPL(name) JsonStructHelper::MergeJson(___json_object_, name::toJson());
-#define ___SERIALIZE_TO_JSON_CONVERT_B_FUNC(...) FOREACH_CALL_FUNC_3(___SERIALIZE_TO_JSON_CONVERT_B_FUNC_IMPL, __VA_ARGS__)
-
-// ============================================================================================
-// Load JSON Wrapper
-#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_A(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_A_FUNC, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_F(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_B(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC, __VA_ARGS__)
-#define ___DESERIALIZE_FROM_JSON_EXTRACT_B_F(name_option) ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_##name_option
-
-// ============================================================================================
-// To JSON Wrapper
-#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_A(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_A_FUNC, __VA_ARGS__)
-#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_F(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_F_FUNC, __VA_ARGS__)
-#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_B(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_B_FUNC, __VA_ARGS__)
-#define ___SERIALIZE_TO_JSON_EXTRACT_B_F(name_option) ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_##name_option
-
-// ============================================================================================
-#define JSONSTRUCT_REGISTER_NOCOPYMOVE(___class_type_, ...)                                                                                          \
-    void loadJson(const QJsonValue &___json_object_)                                                                                                 \
-    {                                                                                                                                                \
-        ___class_type_ ___qjsonstruct_default_check;                                                                                                 \
-        FOREACH_CALL_FUNC(___DESERIALIZE_FROM_JSON_EXTRACT_B_F, __VA_ARGS__);                                                                        \
-    }                                                                                                                                                \
-    [[nodiscard]] const QJsonObject toJson() const                                                                                                   \
-    {                                                                                                                                                \
-        ___class_type_ ___qjsonstruct_default_check;                                                                                                 \
-        QJsonObject ___json_object_;                                                                                                                 \
-        FOREACH_CALL_FUNC(___SERIALIZE_TO_JSON_EXTRACT_B_F, __VA_ARGS__);                                                                            \
-        return ___json_object_;                                                                                                                      \
-    }
-
-#define JSONSTRUCT_REGISTER(___class_type_, ...)                                                                                                     \
-    JSONSTRUCT_REGISTER_NOCOPYMOVE(___class_type_, __VA_ARGS__);                                                                                     \
-    [[nodiscard]] static auto fromJson(const QJsonValue &___json_object_)                                                                            \
-    {                                                                                                                                                \
-        ___class_type_ _t;                                                                                                                           \
-        _t.loadJson(___json_object_);                                                                                                                \
-        return _t;                                                                                                                                   \
-    }
-
-#define ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(type, convert_func)                                                                                \
-    static void Deserialize(type &t, const QJsonValue &d)                                                                                            \
-    {                                                                                                                                                \
-        t = d.convert_func;                                                                                                                          \
-    }
-
-class JsonStructHelper
-{
-  public:
-    static void MergeJson(QJsonObject &mergeTo, const QJsonObject &mergeIn)
-    {
-        for (const auto &key : mergeIn.keys())
-            mergeTo[key] = mergeIn.value(key);
-    }
-    //
-    template<typename T>
-    static void Deserialize(T &t, const QJsonValue &d)
-    {
-        if constexpr (std::is_enum_v<T>)
-            t = (T) d.toInt();
-        else if constexpr (std::is_same_v<T, QJsonObject>)
-            t = d.toObject();
-        else if constexpr (std::is_same_v<T, QJsonArray>)
-            t = d.toArray();
-        else
-            t.loadJson(d);
-    }
-
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(QString, toString());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(QChar, toVariant().toChar());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(std::string, toString().toStdString());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(std::wstring, toString().toStdWString());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(bool, toBool());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(double, toDouble());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(float, toVariant().toFloat());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(int, toInt());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(long, toVariant().toLongLong());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(long long, toVariant().toLongLong());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned int, toVariant().toUInt());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned long, toVariant().toULongLong());
-    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned long long, toVariant().toULongLong());
-
-    template<typename T>
-    static void Deserialize(QList<T> &t, const QJsonValue &d)
-    {
-        t.clear();
-        for (const auto &val : d.toArray())
-        {
-            T data;
-            Deserialize(data, val);
-            t.push_back(data);
-        }
-    }
-
-    template<typename TKey, typename TValue>
-    static void Deserialize(QMap<TKey, TValue> &t, const QJsonValue &d)
-    {
-        t.clear();
-        const auto &jsonObject = d.toObject();
-        TKey keyVal;
-        TValue valueVal;
-        for (const auto &key : jsonObject.keys())
-        {
-            Deserialize(keyVal, key);
-            Deserialize(valueVal, jsonObject.value(key));
-            t.insert(keyVal, valueVal);
-        }
-    }
-
-    // =========================== Store Json Data ===========================
-
-    template<typename T>
-    static QJsonValue Serialize(const T &t)
-    {
-        if constexpr (std::is_enum_v<T>)
-            return (int) t;
-        else if constexpr (std::is_same_v<T, QJsonObject> || std::is_same_v<T, QJsonArray>)
-            return t;
-        else
-            return t.toJson();
-    }
-
-#define pure_func(x) (x)
-#define ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(type)                                                                                             \
-    static QJsonValue Serialize(const type &t)                                                                                                       \
-    {                                                                                                                                                \
-        return QJsonValue(t);                                                                                                                        \
-    }
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(int);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(bool);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QJsonArray);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QJsonObject);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QString);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(long long);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(float);
-    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(double);
-
-#define ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(type, func)                                                                                      \
-    static QJsonValue Serialize(const type &t)                                                                                                       \
-    {                                                                                                                                                \
-        return QJsonValue::fromVariant(func);                                                                                                        \
-    }
-
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(std::string, QString::fromStdString(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(std::wstring, QString::fromStdWString(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(long, QVariant::fromValue<long>(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned int, QVariant::fromValue<unsigned int>(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned long, QVariant::fromValue<unsigned long>(t))
-    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned long long, QVariant::fromValue<unsigned long long>(t))
-
-    template<typename TValue>
-    static QJsonValue Serialize(const QMap<QString, TValue> &t)
-    {
-        QJsonObject mapObject;
-        for (const auto &key : t.keys())
-        {
-            auto valueVal = Serialize(t.value(key));
-            mapObject.insert(key, valueVal);
-        }
-        return mapObject;
-    }
-
-    template<typename T>
-    static QJsonValue Serialize(const QList<T> &t)
-    {
-        QJsonArray listObject;
-        for (const auto &item : t)
-        {
-            listObject.push_back(Serialize(item));
-        }
-        return listObject;
-    }
-};

client/3rd/QJsonStruct/macroexpansion.hpp

@@ -1,74 +0,0 @@
-#pragma once
-
-#define CONCATENATE1(arg1, arg2) CONCATENATE2(arg1, arg2)
-#define CONCATENATE2(arg1, arg2) arg1##arg2
-#define CONCATENATE(x, y) x##y
-
-#define EXPAND(...) __VA_ARGS__
-#define FOR_EACH_1(what, x, ...) what(x)
-#define FOR_EACH_2(what, x, ...) what(x) EXPAND(FOR_EACH_1(what, __VA_ARGS__))
-#define FOR_EACH_3(what, x, ...) what(x) EXPAND(FOR_EACH_2(what, __VA_ARGS__))
-#define FOR_EACH_4(what, x, ...) what(x) EXPAND(FOR_EACH_3(what, __VA_ARGS__))
-#define FOR_EACH_5(what, x, ...) what(x) EXPAND(FOR_EACH_4(what, __VA_ARGS__))
-#define FOR_EACH_6(what, x, ...) what(x) EXPAND(FOR_EACH_5(what, __VA_ARGS__))
-#define FOR_EACH_7(what, x, ...) what(x) EXPAND(FOR_EACH_6(what, __VA_ARGS__))
-#define FOR_EACH_8(what, x, ...) what(x) EXPAND(FOR_EACH_7(what, __VA_ARGS__))
-#define FOR_EACH_9(what, x, ...) what(x) EXPAND(FOR_EACH_8(what, __VA_ARGS__))
-#define FOR_EACH_10(what, x, ...) what(x) EXPAND(FOR_EACH_9(what, __VA_ARGS__))
-#define FOR_EACH_11(what, x, ...) what(x) EXPAND(FOR_EACH_10(what, __VA_ARGS__))
-#define FOR_EACH_12(what, x, ...) what(x) EXPAND(FOR_EACH_11(what, __VA_ARGS__))
-#define FOR_EACH_13(what, x, ...) what(x) EXPAND(FOR_EACH_12(what, __VA_ARGS__))
-#define FOR_EACH_14(what, x, ...) what(x) EXPAND(FOR_EACH_13(what, __VA_ARGS__))
-#define FOR_EACH_15(what, x, ...) what(x) EXPAND(FOR_EACH_14(what, __VA_ARGS__))
-#define FOR_EACH_16(what, x, ...) what(x) EXPAND(FOR_EACH_15(what, __VA_ARGS__))
-
-#define FOR_EACH_NARG(...) FOR_EACH_NARG_(__VA_ARGS__, FOR_EACH_RSEQ_N())
-#define FOR_EACH_NARG_(...) EXPAND(FOR_EACH_ARG_N(__VA_ARGS__))
-#define FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, N, ...) N
-#define FOR_EACH_RSEQ_N() 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-
-#define FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(FOR_EACH_, N)(what, __VA_ARGS__))
-#define FOR_EACH(what, ...) FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
-#define FOREACH_CALL_FUNC(func, ...) FOR_EACH(func, __VA_ARGS__)
-
-// Bad hack ==========================================================================================================================
-#define _2X_FOR_EACH_1(what, x, ...) what(x)
-#define _2X_FOR_EACH_2(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_1(what, __VA_ARGS__))
-#define _2X_FOR_EACH_3(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_2(what, __VA_ARGS__))
-#define _2X_FOR_EACH_4(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_3(what, __VA_ARGS__))
-#define _2X_FOR_EACH_5(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_4(what, __VA_ARGS__))
-#define _2X_FOR_EACH_6(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_5(what, __VA_ARGS__))
-#define _2X_FOR_EACH_7(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_6(what, __VA_ARGS__))
-#define _2X_FOR_EACH_8(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_7(what, __VA_ARGS__))
-#define _2X_FOR_EACH_9(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_8(what, __VA_ARGS__))
-#define _2X_FOR_EACH_10(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_9(what, __VA_ARGS__))
-#define _2X_FOR_EACH_11(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_10(what, __VA_ARGS__))
-#define _2X_FOR_EACH_12(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_11(what, __VA_ARGS__))
-#define _2X_FOR_EACH_13(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_12(what, __VA_ARGS__))
-#define _2X_FOR_EACH_14(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_13(what, __VA_ARGS__))
-#define _2X_FOR_EACH_15(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_14(what, __VA_ARGS__))
-#define _2X_FOR_EACH_16(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_15(what, __VA_ARGS__))
-#define _2X_FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(_2X_FOR_EACH_, N)(what, __VA_ARGS__))
-#define _2X_FOR_EACH(what, ...) _2X_FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
-#define FOREACH_CALL_FUNC_2(func, ...) _2X_FOR_EACH(func, __VA_ARGS__)
-
-// Bad hack ==========================================================================================================================
-#define _3X_FOR_EACH_1(what, x, ...) what(x)
-#define _3X_FOR_EACH_2(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_1(what, __VA_ARGS__))
-#define _3X_FOR_EACH_3(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_2(what, __VA_ARGS__))
-#define _3X_FOR_EACH_4(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_3(what, __VA_ARGS__))
-#define _3X_FOR_EACH_5(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_4(what, __VA_ARGS__))
-#define _3X_FOR_EACH_6(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_5(what, __VA_ARGS__))
-#define _3X_FOR_EACH_7(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_6(what, __VA_ARGS__))
-#define _3X_FOR_EACH_8(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_7(what, __VA_ARGS__))
-#define _3X_FOR_EACH_9(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_8(what, __VA_ARGS__))
-#define _3X_FOR_EACH_10(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_9(what, __VA_ARGS__))
-#define _3X_FOR_EACH_11(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_10(what, __VA_ARGS__))
-#define _3X_FOR_EACH_12(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_11(what, __VA_ARGS__))
-#define _3X_FOR_EACH_13(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_12(what, __VA_ARGS__))
-#define _3X_FOR_EACH_14(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_13(what, __VA_ARGS__))
-#define _3X_FOR_EACH_15(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_14(what, __VA_ARGS__))
-#define _3X_FOR_EACH_16(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_15(what, __VA_ARGS__))
-#define _3X_FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(_3X_FOR_EACH_, N)(what, __VA_ARGS__))
-#define _3X_FOR_EACH(what, ...) _3X_FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
-#define FOREACH_CALL_FUNC_3(func, ...) _3X_FOR_EACH(func, __VA_ARGS__)

client/3rd/QJsonStruct/test/CMakeLists.txt

@@ -1,16 +0,0 @@
-function(QJSONSTRUCT_ADD_TEST TEST_NAME TEST_SOURCE)
-    add_executable(${TEST_NAME} ${TEST_SOURCE} catch.hpp ${QJSONSTRUCT_SOURCES})
-    target_include_directories(${TEST_NAME}
-        PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        )
-    target_link_libraries(
-        ${TEST_NAME}
-        PRIVATE
-        Qt::Core
-        )
-    add_test(NAME QJSONSTRUCT_TEST_${TEST_NAME} COMMAND $<TARGET_FILE:${TEST_NAME}> -s)
-endfunction()
-
-QJSONSTRUCT_ADD_TEST(serialization serialize/main.cpp)
-#QJSONSTRUCT_ADD_TEST(serialize_strings serialize/strings.cpp)

client/3rd/QJsonStruct/test/TestIO.hpp

@@ -1,45 +0,0 @@
-#pragma once
-#include "QJsonStruct.hpp"
-#ifndef _X
-    #include <QList>
-    #include <QString>
-    #include <QStringList>
-#endif
-
-struct BaseStruct
-{
-    QString baseStr;
-    int o;
-    JSONSTRUCT_REGISTER(BaseStruct, F(baseStr, o))
-};
-
-struct BaseStruct2
-{
-    QString baseStr2;
-    int o2;
-    JSONSTRUCT_REGISTER(BaseStruct, F(baseStr2, o2))
-};
-struct TestInnerStruct
-    : BaseStruct
-    , BaseStruct2
-{
-    QJsonObject jobj;
-    QJsonArray jarray;
-    QString str;
-    JSONSTRUCT_REGISTER(TestInnerStruct, B(BaseStruct, BaseStruct2), F(str, jobj, jarray))
-};
-
-struct JsonIOTest
-{
-    QString str;
-    QList<int> listOfNumber;
-    QList<bool> listOfBool;
-    QList<QString> listOfString;
-    QList<QList<QString>> listOfListOfString;
-
-    QMap<QString, QString> map;
-    TestInnerStruct inner;
-
-    JSONSTRUCT_REGISTER(JsonIOTest, F(str, listOfNumber, listOfBool, listOfString, listOfListOfString, map, inner));
-    JsonIOTest(){};
-};

client/3rd/QJsonStruct/test/TestOut.hpp

@@ -1,19 +0,0 @@
-#pragma once
-#include "QJsonStruct.hpp"
-
-struct SubData
-{
-    QString subString;
-    JSONSTRUCT_REGISTER_TOJSON(subString)
-};
-
-struct ToJsonOnlyData
-{
-    QString x;
-    int y;
-    int z;
-    QList<int> ints;
-    SubData sub;
-    QMap<QString, SubData> subs;
-    JSONSTRUCT_REGISTER_TOJSON(x, y, z, sub, ints, subs)
-};

client/3rd/QJsonStruct/test/main.cpp

@@ -1,70 +0,0 @@
-#include "QJsonIO.hpp"
-#include "QJsonStruct.hpp"
-#include "TestIO.hpp"
-#include "TestOut.hpp"
-
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <iostream>
-
-int main(int argc, char *argv[])
-{
-    Q_UNUSED(argc)
-    Q_UNUSED(argv)
-
-    {
-        ToJsonOnlyData data;
-        data.x = "1string";
-        data.y = 2;
-        data.ints << 0;
-        data.ints << 100;
-        data.ints << 900;
-        data.sub.subString = "subs";
-        data.subs["subs-1"] = { "subs1-data" };
-        data.subs["subs-2"] = { "subs2-data" };
-        data.subs["subs-3"] = { "subs3-data" };
-        data.z = 3;
-        auto x = data.toJson();
-        std::cout << QJsonDocument(x).toJson().toStdString() << std::endl;
-    }
-    //
-    {
-        auto f = JsonIOTest::fromJson( //
-            QJsonObject{
-                { "inner", QJsonObject{ { "str", "innerString" },                                 //
-                                        { "jobj", QJsonObject{ { "key", "value" } } },            //
-                                        { "jarray", QJsonArray{ "array0", "array1", "array2" } }, //
-                                        { "baseStr", "baseInnerString" } } },                     //
-                { "str", "data1" },                                                               //
-                { "map", QJsonObject{ { "mapStr", "mapData" } } },                                //
-                { "listOfString", QJsonArray{ "1", "2", "3", "4", "5" } },                        //
-                { "listOfNumber", QJsonArray{ 1, 2, 3, 4, 5 } },                                  //
-                { "listOfBool", QJsonArray{ true, false, false, true, true } },                   //
-                { "listOfListOfString", QJsonArray{ QJsonArray{ "1" },                            //
-                                                    QJsonArray{ "1", "2" },                       //
-                                                    QJsonArray{ "1", "2", "3" },                  //
-                                                    QJsonArray{ "1", "2", "3", "4" },             //
-                                                    QJsonArray{ "1", "2", "3", "4", "5" } } },    //
-            });
-        auto x = f.toJson();
-        std::cout << QJsonDocument(x).toJson().toStdString() << std::endl;
-    }
-    {
-        QJsonObject obj{
-            { "inner", QJsonObject{ { "str", "innerString" }, { "baseStr", "baseInnerString" } } }, //
-            { "str", "data1" },                                                                     //
-            { "map", QJsonObject{ { "mapStr", "mapData" } } },                                      //
-            { "listOfString", QJsonArray{ "1", "2", "3", "4", "5" } },                              //
-            { "listOfNumber", QJsonArray{ 1, 2, 3, 4, 5 } },                                        //
-            { "listOfBool", QJsonArray{ true, false, false, true, true } },                         //
-            { "listOfListOfString", QJsonArray{ QJsonArray{ "1" },                                  //
-                                                QJsonArray{ "1", "2" },                             //
-                                                QJsonArray{ "1", "2", "3" },                        //
-                                                QJsonArray{ "1", "2", "3", "4" },                   //
-                                                QJsonArray{ "1", "2", "3", "4", "5" } } },          //
-        };
-        auto y = QJsonIO::GetValue(obj, std::tuple{ "listOfListOfString", 2 });
-        y.toObject();
-    }
-    return 0;
-}

client/3rd/QJsonStruct/test/serialize/main.cpp

@@ -1,181 +0,0 @@
-#include "QJsonStruct.hpp"
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
-
-const static inline auto INT_TEST_MAX = std::numeric_limits<int>::max() - 1;
-const static inline auto INT_TEST_MIN = -(std::numeric_limits<int>::min() + 1);
-
-#define SINGLE_ELEMENT_CLASS_DECL(CLASS, TYPE, field, defaultvalue, existance)                                                                       \
-    class CLASS                                                                                                                                      \
-    {                                                                                                                                                \
-      public:                                                                                                                                        \
-        TYPE field = defaultvalue;                                                                                                                   \
-        JSONSTRUCT_REGISTER(CLASS, existance(field));                                                                                                \
-    };
-
-// SINGLE_ELEMENT_REQUIRE( CLASS_NAME , TYPE , FIELD , DEFAULT_VALUE , SET VALUE , CHECK VALUE )
-#define SINGLE_ELEMENT_REQUIRE(CLASS, TYPE, field, defaultvalue, value, checkvalue, existance)                                                       \
-    SINGLE_ELEMENT_CLASS_DECL(CLASS, TYPE, field, defaultvalue, existance);                                                                          \
-    CLASS CLASS##_class;                                                                                                                             \
-    CLASS##_class.field = value;                                                                                                                     \
-    REQUIRE(CLASS##_class.toJson()[#field] == checkvalue);
-
-using namespace std;
-SCENARIO("Test Serialization", "[Serialize]")
-{
-    GIVEN("Single Element")
-    {
-        const static QList<QString> defaultList{ "entry 1", "entry 2" };
-        const static QMap<QString, QString> defaultMap{ { "key1", "value1" }, { "key2", "value2" } };
-        typedef QMap<QString, QString> QStringQStringMap;
-
-        WHEN("Serialize a single element")
-        {
-            const static QStringQStringMap setValueMap{ { "newkey1", "newvalue1" } };
-            const static QJsonObject setValueJson{ { "newkey1", QJsonValue{ "newvalue1" } } };
-
-            SINGLE_ELEMENT_REQUIRE(QStringTest_Empty, QString, a, "empty", "", "", F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest, QString, a, "empty", "Some QString", "Some QString", F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_WithQoutes, QString, a, "empty", "\"", "\"", F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_zint, int, a, -10, 0, 0, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_nint, int, a, -10, 1, 1, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_pint, int, a, -10, -1, -1, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_pmint, int, a, -1, INT_TEST_MAX, INT_TEST_MAX, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_zmint, int, a, -1, INT_TEST_MIN, INT_TEST_MIN, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_zuint, uint, a, -10, 0, 0, F);
-            SINGLE_ELEMENT_REQUIRE(QStringTest_puint, uint, a, -10, 1, 1, F);
-            SINGLE_ELEMENT_REQUIRE(BoolTest_True, bool, a, false, true, true, F);
-            SINGLE_ELEMENT_REQUIRE(BoolTest_False, bool, a, true, false, false, F);
-            SINGLE_ELEMENT_REQUIRE(StdStringTest, string, a, "def", "std::string _test", "std::string _test", F);
-            SINGLE_ELEMENT_REQUIRE(QListTest, QList<QString>, a, defaultList, { "newEntry" }, QJsonArray{ "newEntry" }, F);
-            SINGLE_ELEMENT_REQUIRE(QMapTest, QStringQStringMap, a, defaultMap, {}, QJsonObject{}, F);
-            SINGLE_ELEMENT_REQUIRE(QMapValueTest, QStringQStringMap, a, defaultMap, setValueMap, setValueJson, F);
-        }
-
-        WHEN("Serialize a default value")
-        {
-            SINGLE_ELEMENT_REQUIRE(DefaultQString, QString, a, "defaultvalue", "defaultvalue", QJsonValue::Undefined, F);
-            SINGLE_ELEMENT_REQUIRE(DefaultInteger, int, a, 12345, 12345, QJsonValue::Undefined, F);
-            SINGLE_ELEMENT_REQUIRE(DefaultList, QList<QString>, a, defaultList, defaultList, QJsonValue::Undefined, F);
-            SINGLE_ELEMENT_REQUIRE(DefaultMap, QStringQStringMap, a, defaultMap, defaultMap, QJsonValue::Undefined, F);
-        }
-
-        WHEN("Serialize a force existance default value")
-        {
-            const static QJsonArray defaultListJson{ "entry 1", "entry 2" };
-            const static QJsonObject defaultMapJson{ { "key1", "value1" }, { "key2", "value2" } };
-            SINGLE_ELEMENT_REQUIRE(DefaultQString, QString, a, "defaultvalue", "defaultvalue", "defaultvalue", A);
-            SINGLE_ELEMENT_REQUIRE(DefaultInteger, int, a, 12345, 12345, 12345, A);
-            SINGLE_ELEMENT_REQUIRE(DefaultList, QList<QString>, a, defaultList, defaultList, defaultListJson, A);
-            SINGLE_ELEMENT_REQUIRE(DefaultMap, QStringQStringMap, a, defaultMap, defaultMap, defaultMapJson, A);
-        }
-    }
-
-    GIVEN("Multiple Simple Elements")
-    {
-        WHEN("Can Omit Default Value")
-        {
-            class MultipleNonDefaultElementTestClass
-            {
-              public:
-                QString astring;
-                int integer = 0;
-                double adouble = 0.0;
-                QList<QString> myList;
-                JSONSTRUCT_REGISTER(MultipleNonDefaultElementTestClass, F(astring, integer, adouble, myList))
-            };
-            MultipleNonDefaultElementTestClass instance;
-            const auto json = instance.toJson();
-            REQUIRE(json["astring"] == QJsonValue::Undefined);
-            REQUIRE(json["integer"] == QJsonValue::Undefined);
-            REQUIRE(json["adouble"] == QJsonValue::Undefined);
-            REQUIRE(json["myList"] == QJsonValue::Undefined);
-        }
-
-        WHEN("Forcing Existance")
-        {
-            class MultipleNonDefaultExistanceElementTestClass
-            {
-              public:
-                QString astring;
-                int integer = 0;
-                double adouble = 0.0;
-                QList<QString> myList;
-                JSONSTRUCT_REGISTER(MultipleNonDefaultExistanceElementTestClass, A(astring, integer, adouble, myList))
-            };
-            MultipleNonDefaultExistanceElementTestClass instance;
-            const auto json = instance.toJson();
-            REQUIRE(json["astring"] == "");
-            REQUIRE(json["integer"] == 0);
-            REQUIRE(json["adouble"] == 0.0);
-            REQUIRE(json["myList"] == QJsonArray{});
-        }
-    }
-
-    GIVEN("Nested Elements")
-    {
-        WHEN("Can Omit Default Value")
-        {
-            class Parent
-            {
-                class NestedChild
-                {
-                    class NestedChild2
-                    {
-                      public:
-                        int childChildInt = 13579;
-                        JSONSTRUCT_COMPARE(NestedChild2, childChildInt)
-                        JSONSTRUCT_REGISTER(NestedChild2, F(childChildInt))
-                    };
-
-                  public:
-                    int childInt = 54321;
-                    QString childQString = "A QString";
-                    NestedChild2 anotherChild;
-                    JSONSTRUCT_COMPARE(NestedChild, childInt, childQString, anotherChild)
-                    JSONSTRUCT_REGISTER(NestedChild, F(childInt, childQString, anotherChild))
-                };
-
-              public:
-                int parentInt = 12345;
-                NestedChild child;
-                JSONSTRUCT_REGISTER(Parent, F(parentInt, child))
-            };
-
-            WHEN("Omitted whole child element")
-            {
-                Parent parent;
-                const auto json = parent.toJson();
-                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
-                REQUIRE(json["child"] == QJsonValue::Undefined);
-            }
-
-            WHEN("Omitted one element in the child")
-            {
-                const auto childJson = QJsonObject{ { "childInt", 1314 } };
-                Parent parent;
-                parent.child.childInt = 1314;
-                const auto json = parent.toJson();
-                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
-                REQUIRE(json["child"] == childJson);
-                REQUIRE(json["child"]["childInt"] == 1314);
-                REQUIRE(json["child"]["childQString"] == QJsonValue::Undefined);
-                REQUIRE(json["child"]["child"]["anotherChild"] == QJsonValue::Undefined);
-            }
-
-            WHEN("Omitted one element in the child child")
-            {
-                Parent parent;
-                parent.child.childInt = 1314;
-                parent.child.anotherChild.childChildInt = 97531;
-                const auto json = parent.toJson();
-                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
-                REQUIRE(json["child"]["childInt"] == 1314);
-                REQUIRE(json["child"]["childQString"] == QJsonValue::Undefined);
-                const QJsonObject childChild{ { "childChildInt", 97531 } };
-                REQUIRE(json["child"]["anotherChild"] == childChild);
-                REQUIRE(json["child"]["anotherChild"]["childChildInt"] == 97531);
-            }
-        }
-    }
-}

client/CMakeLists.txt

@@ -134,8 +134,6 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/version.h
     ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.h
     ${CMAKE_CURRENT_LIST_DIR}/core/networkUtilities.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/serialization.h
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/transfer.h
 )
 
 # Mozilla headres
@@ -178,14 +176,6 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/networkUtilities.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/outbound.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/inbound.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/ss.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/ssd.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vless.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/trojan.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess_new.cpp
 )
 
 # Mozilla sources

client/amnezia_application.cpp

@@ -351,9 +351,6 @@ void AmneziaApplication::initModels()
     m_sftpConfigModel.reset(new SftpConfigModel(this));
     m_engine->rootContext()->setContextProperty("SftpConfigModel", m_sftpConfigModel.get());
 
-    m_socks5ConfigModel.reset(new Socks5ProxyConfigModel(this));
-    m_engine->rootContext()->setContextProperty("Socks5ProxyConfigModel", m_socks5ConfigModel.get());
-
     m_clientManagementModel.reset(new ClientManagementModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ClientManagementModel", m_clientManagementModel.get());
     connect(m_clientManagementModel.get(), &ClientManagementModel::adminConfigRevoked, m_serversModel.get(),
@@ -381,7 +378,7 @@ void AmneziaApplication::initControllers()
 
     connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
 
-    m_pageController.reset(new PageController(m_serversModel, m_settings));
+    m_pageController.reset(new PageController(m_serversModel, m_settings, m_languageModel));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
     m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel, m_settings));

client/amnezia_application.h

@@ -41,7 +41,6 @@
 #include "ui/models/protocols_model.h"
 #include "ui/models/servers_model.h"
 #include "ui/models/services/sftpConfigModel.h"
-#include "ui/models/services/socks5ProxyConfigModel.h"
 #include "ui/models/sites_model.h"
 #include "ui/models/clientManagementModel.h"
 #include "ui/models/appSplitTunnelingModel.h"
@@ -115,7 +114,6 @@ private:
 #endif
 
     QScopedPointer<SftpConfigModel> m_sftpConfigModel;
-    QScopedPointer<Socks5ProxyConfigModel> m_socks5ConfigModel;
 
     QSharedPointer<VpnConnection> m_vpnConnection;
     QThread m_vpnConnectionThread;

client/android/AndroidManifest.xml

@@ -136,34 +136,8 @@
         </activity>
 
         <service
-            android:name=".AwgService"
-            android:process=":amneziaAwgService"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:exported="false"
-            tools:ignore="ForegroundServicePermission">
-
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".OpenVpnService"
-            android:process=":amneziaOpenVpnService"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:exported="false"
-            tools:ignore="ForegroundServicePermission">
-
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".XrayService"
-            android:process=":amneziaXrayService"
+            android:name=".AmneziaVpnService"
+            android:process=":amneziaVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE"
             android:foregroundServiceType="systemExempted"
             android:exported="false"

client/android/build.gradle.kts

@@ -3,7 +3,6 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
     id("property-delegate")
 }
 
@@ -69,12 +68,6 @@ android {
             }
             signingConfig = signingConfigs["release"]
         }
-
-        create("fdroid") {
-            initWith(getByName("release"))
-            signingConfig = null
-            matchingFallbacks += "release"
-        }
     }
 
     splits {
@@ -105,6 +98,7 @@ android {
 }
 
 dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
     implementation(project(":qt"))
     implementation(project(":utils"))
     implementation(project(":protocolApi"))
@@ -112,11 +106,9 @@ dependencies {
     implementation(project(":awg"))
     implementation(project(":openvpn"))
     implementation(project(":cloak"))
-    implementation(project(":xray"))
     implementation(libs.androidx.core)
     implementation(libs.androidx.activity)
     implementation(libs.kotlinx.coroutines)
-    implementation(libs.kotlinx.serialization.protobuf)
     implementation(libs.bundles.androidx.camera)
     implementation(libs.google.mlkit)
     implementation(libs.androidx.datastore)

client/android/gradle/libs.versions.toml

@@ -8,7 +8,6 @@ androidx-camera = "1.3.0"
 androidx-security-crypto = "1.1.0-alpha06"
 androidx-datastore = "1.1.0-beta01"
 kotlinx-coroutines = "1.7.3"
-kotlinx-serialization = "1.6.3"
 google-mlkit = "17.2.0"
 
 [libraries]
@@ -22,7 +21,6 @@ androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "
 androidx-security-crypto = { module = "androidx.security:security-crypto-ktx", version.ref = "androidx-security-crypto" }
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
-kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" }
 google-mlkit = { module = "com.google.mlkit:barcode-scanning", version.ref = "google-mlkit" }
 
 [bundles]
@@ -37,4 +35,3 @@ androidx-camera = [
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}

client/android/openvpn/src/main/kotlin/org/amnezia/vpn/protocol/openvpn/OpenVpn.kt

@@ -1,13 +1,15 @@
 package org.amnezia.vpn.protocol.openvpn
 
+import android.content.Context
 import android.net.VpnService.Builder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import net.openvpn.ovpn3.ClientAPI_Config
 import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.Protocol
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.Statistics
 import org.amnezia.vpn.protocol.VpnStartException
@@ -35,6 +37,7 @@ import org.json.JSONObject
 
 open class OpenVpn : Protocol() {
 
+    private lateinit var context: Context
     private var openVpnClient: OpenVpnClient? = null
     private lateinit var scope: CoroutineScope
 
@@ -50,11 +53,10 @@ open class OpenVpn : Protocol() {
             return Statistics.EMPTY_STATISTICS
         }
 
-    override fun internalInit() {
-        if (!isInitialized) loadSharedLibrary(context, "ovpn3")
-        if (this::scope.isInitialized) {
-            scope.cancel()
-        }
+    override fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
+        super.initialize(context, state, onError)
+        loadSharedLibrary(context, "ovpn3")
+        this.context = context
         scope = CoroutineScope(Dispatchers.IO)
     }
 

client/android/protocolApi/src/main/kotlin/Protocol.kt

@@ -27,21 +27,14 @@ private const val SPLIT_TUNNEL_EXCLUDE = 2
 abstract class Protocol {
 
     abstract val statistics: Statistics
-    protected lateinit var context: Context
     protected lateinit var state: MutableStateFlow<ProtocolState>
     protected lateinit var onError: (String) -> Unit
-    protected var isInitialized: Boolean = false
 
-    fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
-        this.context = context
+    open fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
         this.state = state
         this.onError = onError
-        internalInit()
-        isInitialized = true
     }
 
-    protected abstract fun internalInit()
-
     abstract fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean)
 
     abstract fun stopVpn()

client/android/qt/build.gradle.kts

@@ -21,5 +21,5 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "../libs", "include" to listOf("*.jar"))))
+    implementation(fileTree(mapOf("dir" to "../libs", "include" to listOf("*.jar", "*.aar"))))
 }

client/android/settings.gradle.kts

@@ -36,8 +36,6 @@ include(":wireguard")
 include(":awg")
 include(":openvpn")
 include(":cloak")
-include(":xray")
-include(":xray:libXray")
 
 // get values from gradle or local properties
 val androidBuildToolsVersion: String by gradleProperties

client/android/src/org/amnezia/vpn/AmneziaActivity.kt

@@ -34,7 +34,6 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -44,8 +43,6 @@ import org.amnezia.vpn.protocol.getStatus
 import org.amnezia.vpn.qt.QtAndroidController
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.Prefs
-import org.json.JSONException
-import org.json.JSONObject
 import org.qtproject.qt.android.bindings.QtActivity
 
 private const val TAG = "AmneziaActivity"
@@ -62,7 +59,6 @@ class AmneziaActivity : QtActivity() {
 
     private lateinit var mainScope: CoroutineScope
     private val qtInitialized = CompletableDeferred<Unit>()
-    private var vpnProto: VpnProto? = null
     private var isWaitingStatus = true
     private var isServiceConnected = false
     private var isInBoundState = false
@@ -145,7 +141,6 @@ class AmneziaActivity : QtActivity() {
             override fun onBindingDied(name: ComponentName?) {
                 Log.w(TAG, "Binding to the ${name?.flattenToString()} unexpectedly died")
                 doUnbindService()
-                QtAndroidController.onServiceDisconnected()
                 doBindService()
             }
         }
@@ -158,20 +153,15 @@ class AmneziaActivity : QtActivity() {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "Create Amnezia activity: $intent")
         mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
-        val proto = mainScope.async(Dispatchers.IO) {
-            VpnStateStore.getVpnState().vpnProto
-        }
         vpnServiceMessenger = IpcMessenger(
             "VpnService",
             onDeadObjectException = {
                 doUnbindService()
-                QtAndroidController.onServiceDisconnected()
                 doBindService()
             }
         )
         registerBroadcastReceivers()
         intent?.let(::processIntent)
-        runBlocking { vpnProto = proto.await() }
     }
 
     private fun registerBroadcastReceivers() {
@@ -219,18 +209,13 @@ class AmneziaActivity : QtActivity() {
         Log.d(TAG, "Start Amnezia activity")
         mainScope.launch {
             qtInitialized.await()
-            vpnProto?.let { proto ->
-                if (AmneziaVpnService.isRunning(applicationContext, proto.processName)) {
-                    doBindService()
-                }
-            }
+            doBindService()
         }
     }
 
     override fun onStop() {
         Log.d(TAG, "Stop Amnezia activity")
         doUnbindService()
-        QtAndroidController.onServiceDisconnected()
         super.onStop()
     }
 
@@ -284,12 +269,10 @@ class AmneziaActivity : QtActivity() {
     @MainThread
     private fun doBindService() {
         Log.d(TAG, "Bind service")
-        vpnProto?.let { proto ->
-            Intent(this, proto.serviceClass).also {
-                bindService(it, serviceConnection, BIND_ABOVE_CLIENT and BIND_AUTO_CREATE)
-            }
-            isInBoundState = true
+        Intent(this, AmneziaVpnService::class.java).also {
+            bindService(it, serviceConnection, BIND_ABOVE_CLIENT and BIND_AUTO_CREATE)
         }
+        isInBoundState = true
     }
 
     @MainThread
@@ -297,6 +280,7 @@ class AmneziaActivity : QtActivity() {
         if (isInBoundState) {
             Log.d(TAG, "Unbind service")
             isWaitingStatus = true
+            QtAndroidController.onServiceDisconnected()
             isServiceConnected = false
             vpnServiceMessenger.send(Action.UNREGISTER_CLIENT, activityMessenger)
             vpnServiceMessenger.reset()
@@ -381,31 +365,13 @@ class AmneziaActivity : QtActivity() {
 
     @MainThread
     private fun startVpn(vpnConfig: String) {
-        getVpnProto(vpnConfig)?.let { proto ->
-            Log.d(TAG, "Proto from config: $proto, current proto: $vpnProto")
-            if (isServiceConnected) {
-                if (proto == vpnProto) {
-                    connectToVpn(vpnConfig)
-                    return
-                }
-                doUnbindService()
-            }
-            vpnProto = proto
+        if (isServiceConnected) {
+            connectToVpn(vpnConfig)
+        } else {
             isWaitingStatus = false
-            startVpnService(vpnConfig, proto)
+            startVpnService(vpnConfig)
             doBindService()
-        } ?: QtAndroidController.onServiceError()
-    }
-
-    private fun getVpnProto(vpnConfig: String): VpnProto? = try {
-        require(vpnConfig.isNotBlank()) { "Blank VPN config" }
-        VpnProto.get(JSONObject(vpnConfig).getString("protocol"))
-    } catch (e: JSONException) {
-        Log.e(TAG, "Invalid VPN config json format: ${e.message}")
-        null
-    } catch (e: IllegalArgumentException) {
-        Log.e(TAG, "Protocol not found: ${e.message}")
-        null
+        }
     }
 
     private fun connectToVpn(vpnConfig: String) {
@@ -417,15 +383,15 @@ class AmneziaActivity : QtActivity() {
         }
     }
 
-    private fun startVpnService(vpnConfig: String, proto: VpnProto) {
-        Log.d(TAG, "Start VPN service: $proto")
-        Intent(this, proto.serviceClass).apply {
+    private fun startVpnService(vpnConfig: String) {
+        Log.d(TAG, "Start VPN service")
+        Intent(this, AmneziaVpnService::class.java).apply {
             putExtra(MSG_VPN_CONFIG, vpnConfig)
         }.also {
             try {
                 ContextCompat.startForegroundService(this, it)
             } catch (e: SecurityException) {
-                Log.e(TAG, "Failed to start ${proto.serviceClass.simpleName}: $e")
+                Log.e(TAG, "Failed to start AmneziaVpnService: $e")
                 QtAndroidController.onServiceError()
             }
         }

client/android/src/org/amnezia/vpn/AmneziaTileService.kt

@@ -39,9 +39,6 @@ class AmneziaTileService : TileService() {
 
     @Volatile
     private var isServiceConnected = false
-
-    @Volatile
-    private var vpnProto: VpnProto? = null
     private var isInBoundState = false
     @Volatile
     private var isVpnConfigExists = false
@@ -97,21 +94,16 @@ class AmneziaTileService : TileService() {
 
     override fun onStartListening() {
         super.onStartListening()
-        scope.launch {
-            Log.d(TAG, "Start listening")
-            vpnProto = VpnStateStore.getVpnState().vpnProto
-            vpnProto.also { proto ->
-                if (proto != null && AmneziaVpnService.isRunning(applicationContext, proto.processName)) {
-                    Log.d(TAG, "Vpn service is running")
-                    doBindService()
-                } else {
-                    Log.d(TAG, "Vpn service is not running")
-                    isServiceConnected = false
-                    updateVpnState(DISCONNECTED)
-                }
-            }
-            vpnStateListeningJob = launchVpnStateListening()
+        Log.d(TAG, "Start listening")
+        if (AmneziaVpnService.isRunning(applicationContext)) {
+            Log.d(TAG, "Vpn service is running")
+            doBindService()
+        } else {
+            Log.d(TAG, "Vpn service is not running")
+            isServiceConnected = false
+            updateVpnState(DISCONNECTED)
         }
+        vpnStateListeningJob = launchVpnStateListening()
     }
 
     override fun onStopListening() {
@@ -132,7 +124,7 @@ class AmneziaTileService : TileService() {
     }
 
     private fun onClickInternal() {
-        if (isVpnConfigExists && vpnProto != null) {
+        if (isVpnConfigExists) {
             Log.d(TAG, "Change VPN state")
             if (qsTile.state == Tile.STATE_INACTIVE) {
                 Log.d(TAG, "Start VPN")
@@ -155,12 +147,10 @@ class AmneziaTileService : TileService() {
 
     private fun doBindService() {
         Log.d(TAG, "Bind service")
-        vpnProto?.let { proto ->
-            Intent(this, proto.serviceClass).also {
-                bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
-            }
-            isInBoundState = true
+        Intent(this, AmneziaVpnService::class.java).also {
+            bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
         }
+        isInBoundState = true
     }
 
     private fun doUnbindService() {
@@ -190,7 +180,6 @@ class AmneziaTileService : TileService() {
         if (VpnService.prepare(applicationContext) != null) {
             Intent(this, VpnRequestActivity::class.java).apply {
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                putExtra(EXTRA_PROTOCOL, vpnProto)
             }.also {
                 startActivityAndCollapseCompat(it)
             }
@@ -200,16 +189,14 @@ class AmneziaTileService : TileService() {
         }
 
     private fun startVpnService() {
-        vpnProto?.let { proto ->
-            try {
-                ContextCompat.startForegroundService(
-                    applicationContext,
-                    Intent(this, proto.serviceClass)
-                )
-            } catch (e: SecurityException) {
-                Log.e(TAG, "Failed to start ${proto.serviceClass.simpleName}: $e")
-            }
-        } ?: Log.e(TAG, "Failed to start vpn service: vpnProto is null")
+        try {
+            ContextCompat.startForegroundService(
+                applicationContext,
+                Intent(this, AmneziaVpnService::class.java)
+            )
+        } catch (e: SecurityException) {
+            Log.e(TAG, "Failed to start AmneziaVpnService: $e")
+        }
     }
 
     private fun connectToVpn() = vpnServiceMessenger.send(Action.CONNECT)
@@ -233,8 +220,11 @@ class AmneziaTileService : TileService() {
         }
     }
 
-    private fun updateVpnState(state: ProtocolState) =
-        scope.launch { VpnStateStore.store { it.copy(protocolState = state) } }
+    private fun updateVpnState(state: ProtocolState) {
+        scope.launch {
+            VpnStateStore.store { it.copy(protocolState = state) }
+        }
+    }
 
     private fun launchVpnStateListening() =
         scope.launch { VpnStateStore.dataFlow().collectLatest(::updateTile) }
@@ -242,10 +232,9 @@ class AmneziaTileService : TileService() {
     private fun updateTile(vpnState: VpnState) {
         Log.d(TAG, "Update tile: $vpnState")
         isVpnConfigExists = vpnState.serverName != null
-        vpnProto = vpnState.vpnProto
         val tile = qsTile ?: return
         tile.apply {
-            label = (vpnState.serverName ?: DEFAULT_TILE_LABEL) + (vpnProto?.let { " ${it.label}" } ?: "")
+            label = vpnState.serverName ?: DEFAULT_TILE_LABEL
             when (val protocolState = vpnState.protocolState) {
                 CONNECTED -> {
                     state = Tile.STATE_ACTIVE

client/android/src/org/amnezia/vpn/AmneziaVpnService.kt

@@ -1,6 +1,5 @@
 package org.amnezia.vpn
 
-import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE
 import android.app.NotificationManager
@@ -40,6 +39,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.LoadLibraryException
+import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
@@ -48,7 +48,11 @@ import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
 import org.amnezia.vpn.protocol.VpnException
 import org.amnezia.vpn.protocol.VpnStartException
+import org.amnezia.vpn.protocol.awg.Awg
+import org.amnezia.vpn.protocol.cloak.Cloak
+import org.amnezia.vpn.protocol.openvpn.OpenVpn
 import org.amnezia.vpn.protocol.putStatus
+import org.amnezia.vpn.protocol.wireguard.Wireguard
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.Prefs
 import org.amnezia.vpn.util.net.NetworkState
@@ -59,7 +63,6 @@ import org.json.JSONObject
 private const val TAG = "AmneziaVpnService"
 
 const val ACTION_DISCONNECT = "org.amnezia.vpn.action.disconnect"
-const val ACTION_CONNECT = "org.amnezia.vpn.action.connect"
 
 const val MSG_VPN_CONFIG = "VPN_CONFIG"
 const val MSG_ERROR = "ERROR"
@@ -70,18 +73,19 @@ const val AFTER_PERMISSION_CHECK = "AFTER_PERMISSION_CHECK"
 private const val PREFS_CONFIG_KEY = "LAST_CONF"
 private const val PREFS_SERVER_NAME = "LAST_SERVER_NAME"
 private const val PREFS_SERVER_INDEX = "LAST_SERVER_INDEX"
+private const val PROCESS_NAME = "org.amnezia.vpn:amneziaVpnService"
 // private const val STATISTICS_SENDING_TIMEOUT = 1000L
 private const val TRAFFIC_STATS_UPDATE_TIMEOUT = 1000L
 private const val DISCONNECT_TIMEOUT = 5000L
 private const val STOP_SERVICE_TIMEOUT = 5000L
 
-@SuppressLint("Registered")
-open class AmneziaVpnService : VpnService() {
+class AmneziaVpnService : VpnService() {
 
     private lateinit var mainScope: CoroutineScope
     private lateinit var connectionScope: CoroutineScope
     private var isServiceBound = false
-    private var vpnProto: VpnProto? = null
+    private var protocol: Protocol? = null
+    private val protocolCache = mutableMapOf<String, Protocol>()
     private var protocolState = MutableStateFlow(UNKNOWN)
     private var serverName: String? = null
     private var serverIndex: Int = -1
@@ -101,7 +105,7 @@ open class AmneziaVpnService : VpnService() {
     // private var statisticsSendingJob: Job? = null
     private lateinit var networkState: NetworkState
     private lateinit var trafficStats: TrafficStats
-    private var controlReceiver: BroadcastReceiver? = null
+    private var disconnectReceiver: BroadcastReceiver? = null
     private var notificationStateReceiver: BroadcastReceiver? = null
     private var screenOnReceiver: BroadcastReceiver? = null
     private var screenOffReceiver: BroadcastReceiver? = null
@@ -112,6 +116,7 @@ open class AmneziaVpnService : VpnService() {
 
     private val connectionExceptionHandler = CoroutineExceptionHandler { _, e ->
         protocolState.value = DISCONNECTED
+        protocol = null
         when (e) {
             is IllegalArgumentException,
             is VpnStartException,
@@ -222,8 +227,7 @@ open class AmneziaVpnService : VpnService() {
             connect(intent?.getStringExtra(MSG_VPN_CONFIG))
         }
         ServiceCompat.startForeground(
-            this, NOTIFICATION_ID,
-            serviceNotification.buildNotification(serverName, vpnProto?.label, protocolState.value),
+            this, NOTIFICATION_ID, serviceNotification.buildNotification(serverName, protocolState.value),
             foregroundServiceTypeCompat
         )
         return START_REDELIVER_INTENT
@@ -288,17 +292,9 @@ open class AmneziaVpnService : VpnService() {
 
     private fun registerBroadcastReceivers() {
         Log.d(TAG, "Register broadcast receivers")
-        controlReceiver = registerBroadcastReceiver(
-            arrayOf(ACTION_CONNECT, ACTION_DISCONNECT), ContextCompat.RECEIVER_NOT_EXPORTED
-        ) {
-            it?.action?.let { action ->
-                Log.d(TAG, "Broadcast request received: $action")
-                when (action) {
-                    ACTION_CONNECT -> connect()
-                    ACTION_DISCONNECT -> disconnect()
-                    else -> Log.w(TAG, "Unknown action received: $action")
-                }
-            }
+        disconnectReceiver = registerBroadcastReceiver(ACTION_DISCONNECT, ContextCompat.RECEIVER_NOT_EXPORTED) {
+            Log.d(TAG, "Broadcast request received: $ACTION_DISCONNECT")
+            disconnect()
         }
 
         notificationStateReceiver = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@@ -344,10 +340,10 @@ open class AmneziaVpnService : VpnService() {
 
     private fun unregisterBroadcastReceivers() {
         Log.d(TAG, "Unregister broadcast receivers")
-        unregisterBroadcastReceiver(controlReceiver)
+        unregisterBroadcastReceiver(disconnectReceiver)
         unregisterBroadcastReceiver(notificationStateReceiver)
         unregisterScreenStateBroadcastReceivers()
-        controlReceiver = null
+        disconnectReceiver = null
         notificationStateReceiver = null
     }
 
@@ -360,7 +356,7 @@ open class AmneziaVpnService : VpnService() {
             protocolState.drop(1).collect { protocolState ->
                 Log.d(TAG, "Protocol state changed: $protocolState")
 
-                serviceNotification.updateNotification(serverName, vpnProto?.label, protocolState)
+                serviceNotification.updateNotification(serverName, protocolState)
 
                 clientMessengers.send {
                     ServiceEvent.STATUS_CHANGED.packToMessage {
@@ -368,7 +364,7 @@ open class AmneziaVpnService : VpnService() {
                     }
                 }
 
-                VpnStateStore.store { VpnState(protocolState, serverName, serverIndex, vpnProto) }
+                VpnStateStore.store { VpnState(protocolState, serverName, serverIndex) }
 
                 when (protocolState) {
                     CONNECTED -> {
@@ -425,7 +421,7 @@ open class AmneziaVpnService : VpnService() {
     @MainThread
     private fun enableNotification() {
         registerScreenStateBroadcastReceivers()
-        serviceNotification.updateNotification(serverName, vpnProto?.label, protocolState.value)
+        serviceNotification.updateNotification(serverName, protocolState.value)
         launchTrafficStatsUpdate()
     }
 
@@ -488,6 +484,8 @@ open class AmneziaVpnService : VpnService() {
 
         Log.d(TAG, "Start VPN connection")
 
+        protocolState.value = CONNECTING
+
         val config = parseConfigToJson(vpnConfig)
         saveServerData(config)
         if (config == null) {
@@ -496,16 +494,6 @@ open class AmneziaVpnService : VpnService() {
             return
         }
 
-        try {
-            vpnProto = VpnProto.get(config.getString("protocol"))
-        } catch (e: Exception) {
-            onError("Invalid VPN config: ${e.message}")
-            protocolState.value = DISCONNECTED
-            return
-        }
-
-        protocolState.value = CONNECTING
-
         if (!checkPermission()) {
             protocolState.value = DISCONNECTED
             return
@@ -515,10 +503,8 @@ open class AmneziaVpnService : VpnService() {
             disconnectionJob?.join()
             disconnectionJob = null
 
-            vpnProto?.protocol?.let { protocol ->
-                protocol.initialize(applicationContext, protocolState, ::onError)
-                protocol.startVpn(config, Builder(), ::protect)
-            }
+            protocol = getProtocol(config.getString("protocol"))
+            protocol?.startVpn(config, Builder(), ::protect)
         }
     }
 
@@ -534,8 +520,8 @@ open class AmneziaVpnService : VpnService() {
             connectionJob?.join()
             connectionJob = null
 
-            vpnProto?.protocol?.stopVpn()
-
+            protocol?.stopVpn()
+            protocol = null
             try {
                 withTimeout(DISCONNECT_TIMEOUT) {
                     // waiting for disconnect state
@@ -557,10 +543,22 @@ open class AmneziaVpnService : VpnService() {
         protocolState.value = RECONNECTING
 
         connectionJob = connectionScope.launch {
-            vpnProto?.protocol?.reconnectVpn(Builder())
+            protocol?.reconnectVpn(Builder())
         }
     }
 
+    @MainThread
+    private fun getProtocol(protocolName: String): Protocol =
+        protocolCache[protocolName]
+            ?: when (protocolName) {
+                "wireguard" -> Wireguard()
+                "awg" -> Awg()
+                "openvpn" -> OpenVpn()
+                "cloak" -> Cloak()
+                else -> throw IllegalArgumentException("Protocol '$protocolName' not found")
+            }.apply { initialize(applicationContext, protocolState, ::onError) }
+                .also { protocolCache[protocolName] = it }
+
     /**
      * Utils methods
      */
@@ -605,7 +603,6 @@ open class AmneziaVpnService : VpnService() {
         if (prepare(applicationContext) != null) {
             Intent(this, VpnRequestActivity::class.java).apply {
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                putExtra(EXTRA_PROTOCOL, vpnProto)
             }.also {
                 startActivity(it)
             }
@@ -615,9 +612,9 @@ open class AmneziaVpnService : VpnService() {
         }
 
     companion object {
-        fun isRunning(context: Context, processName: String): Boolean =
+        fun isRunning(context: Context): Boolean =
             context.getSystemService<ActivityManager>()!!.runningAppProcesses.any {
-                it.processName == processName && it.importance <= IMPORTANCE_FOREGROUND_SERVICE
+                it.processName == PROCESS_NAME && it.importance <= IMPORTANCE_FOREGROUND_SERVICE
             }
     }
 }

client/android/src/org/amnezia/vpn/AwgService.kt

@@ -1,3 +0,0 @@
-package org.amnezia.vpn
-
-class AwgService : AmneziaVpnService()

client/android/src/org/amnezia/vpn/CameraActivity.kt

@@ -140,7 +140,7 @@ class CameraActivity : ComponentActivity() {
                             }
                         }
                     }.addOnFailureListener {
-                        Log.e(TAG, "Processing QR code image failed: ${it.message}")
+                        Log.e(TAG, "Processing QR-code image failed: ${it.message}")
                     }.addOnCompleteListener {
                         imageProxy.close()
                     }

client/android/src/org/amnezia/vpn/OpenVpnService.kt

@@ -1,3 +0,0 @@
-package org.amnezia.vpn
-
-class OpenVpnService : AmneziaVpnService()

client/android/src/org/amnezia/vpn/ServiceNotification.kt

@@ -59,14 +59,14 @@ class ServiceNotification(private val context: Context) {
         formatSpeedString(rxString, txString)
     }
 
-    fun buildNotification(serverName: String?, protocol: String?, state: ProtocolState): Notification {
+    fun buildNotification(serverName: String?, state: ProtocolState): Notification {
         val speedString = if (state == CONNECTED) zeroSpeed else null
 
         Log.d(TAG, "Build notification: $serverName, $state")
 
         return notificationBuilder
             .setSmallIcon(R.drawable.ic_amnezia_round)
-            .setContentTitle((serverName ?: "AmneziaVPN") + (protocol?.let { " $it" } ?: ""))
+            .setContentTitle(serverName ?: "AmneziaVPN")
             .setContentText(context.getString(state))
             .setSubText(speedString)
             .setWhen(System.currentTimeMillis())
@@ -96,10 +96,10 @@ class ServiceNotification(private val context: Context) {
     }
 
     @SuppressLint("MissingPermission")
-    fun updateNotification(serverName: String?, protocol: String?, state: ProtocolState) {
+    fun updateNotification(serverName: String?, state: ProtocolState) {
         if (context.isNotificationPermissionGranted()) {
             Log.d(TAG, "Update notification: $serverName, $state")
-            notificationManager.notify(NOTIFICATION_ID, buildNotification(serverName, protocol, state))
+            notificationManager.notify(NOTIFICATION_ID, buildNotification(serverName, state))
         }
     }
 
@@ -125,7 +125,7 @@ class ServiceNotification(private val context: Context) {
                         context,
                         DISCONNECT_REQUEST_CODE,
                         Intent(ACTION_DISCONNECT).apply {
-                            setPackage(context.packageName)
+                            setPackage("org.amnezia.vpn")
                         },
                         PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
                     )
@@ -135,12 +135,10 @@ class ServiceNotification(private val context: Context) {
             DISCONNECTED -> {
                 Action(
                     0, context.getString(R.string.connect),
-                    PendingIntent.getBroadcast(
+                    createServicePendingIntent(
                         context,
                         CONNECT_REQUEST_CODE,
-                        Intent(ACTION_CONNECT).apply {
-                            setPackage(context.packageName)
-                        },
+                        Intent(context, AmneziaVpnService::class.java),
                         PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
                     )
                 )
@@ -150,6 +148,13 @@ class ServiceNotification(private val context: Context) {
         }
     }
 
+    private val createServicePendingIntent: (Context, Int, Intent, Int) -> PendingIntent =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            PendingIntent::getForegroundService
+        } else {
+            PendingIntent::getService
+        }
+
     companion object {
         fun createNotificationChannel(context: Context) {
             with(NotificationManagerCompat.from(context)) {

client/android/src/org/amnezia/vpn/VpnProto.kt

@@ -1,67 +0,0 @@
-package org.amnezia.vpn
-
-import org.amnezia.vpn.protocol.Protocol
-import org.amnezia.vpn.protocol.awg.Awg
-import org.amnezia.vpn.protocol.cloak.Cloak
-import org.amnezia.vpn.protocol.openvpn.OpenVpn
-import org.amnezia.vpn.protocol.wireguard.Wireguard
-import org.amnezia.vpn.protocol.xray.Xray
-
-enum class VpnProto(
-    val label: String,
-    val processName: String,
-    val serviceClass: Class<out AmneziaVpnService>
-) {
-    WIREGUARD(
-        "WireGuard",
-        "org.amnezia.vpn:amneziaAwgService",
-        AwgService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Wireguard()
-    },
-
-    AWG(
-        "AmneziaWG",
-        "org.amnezia.vpn:amneziaAwgService",
-        AwgService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Awg()
-    },
-
-    OPENVPN(
-        "OpenVPN",
-        "org.amnezia.vpn:amneziaOpenVpnService",
-        OpenVpnService::class.java
-    ) {
-        override fun createProtocol(): Protocol = OpenVpn()
-    },
-
-    CLOAK(
-        "Cloak",
-        "org.amnezia.vpn:amneziaOpenVpnService",
-        OpenVpnService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Cloak()
-    },
-
-    XRAY(
-        "XRay",
-        "org.amnezia.vpn:amneziaXrayService",
-        XrayService::class.java
-    ) {
-        override fun createProtocol(): Protocol = Xray()
-    };
-
-    private var _protocol: Protocol? = null
-    val protocol: Protocol
-        get() {
-            if (_protocol == null) _protocol = createProtocol()
-            return _protocol ?: throw AssertionError("Set to null by another thread")
-        }
-
-    protected abstract fun createProtocol(): Protocol
-
-    companion object {
-        fun get(protocolName: String): VpnProto = VpnProto.valueOf(protocolName.uppercase())
-    }
-}

client/android/src/org/amnezia/vpn/VpnRequestActivity.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.content.res.Configuration.UI_MODE_NIGHT_MASK
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.net.VpnService
-import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.widget.Toast
@@ -19,11 +18,9 @@ import androidx.core.content.getSystemService
 import org.amnezia.vpn.util.Log
 
 private const val TAG = "VpnRequestActivity"
-const val EXTRA_PROTOCOL = "PROTOCOL"
 
 class VpnRequestActivity : ComponentActivity() {
 
-    private var vpnProto: VpnProto? = null
     private var userPresentReceiver: BroadcastReceiver? = null
     private val requestLauncher =
         registerForActivityResult(StartActivityForResult(), ::checkRequestResult)
@@ -31,12 +28,6 @@ class VpnRequestActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "Start request activity")
-        vpnProto = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            intent.extras?.getSerializable(EXTRA_PROTOCOL, VpnProto::class.java)
-        } else {
-            @Suppress("DEPRECATION")
-            intent.extras?.getSerializable(EXTRA_PROTOCOL) as VpnProto
-        }
         val requestIntent = VpnService.prepare(applicationContext)
         if (requestIntent != null) {
             if (getSystemService<KeyguardManager>()!!.isKeyguardLocked) {
@@ -75,18 +66,10 @@ class VpnRequestActivity : ComponentActivity() {
 
     private fun onPermissionGranted() {
         Toast.makeText(this, resources.getString(R.string.vpnGranted), Toast.LENGTH_LONG).show()
-        vpnProto?.let { proto ->
-            Intent(applicationContext, proto.serviceClass).apply {
-                putExtra(AFTER_PERMISSION_CHECK, true)
-            }.also {
-                ContextCompat.startForegroundService(this, it)
-            }
-        } ?: run {
-            Intent(this, AmneziaActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivity(it)
-            }
+        Intent(applicationContext, AmneziaVpnService::class.java).apply {
+            putExtra(AFTER_PERMISSION_CHECK, true)
+        }.also {
+            ContextCompat.startForegroundService(this, it)
         }
     }
 

client/android/src/org/amnezia/vpn/VpnState.kt

@@ -1,22 +1,19 @@
 package org.amnezia.vpn
 
 import android.app.Application
-import androidx.datastore.core.CorruptionException
 import androidx.datastore.core.MultiProcessDataStoreFactory
 import androidx.datastore.core.Serializer
-import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
 import androidx.datastore.dataStoreFile
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import java.io.ObjectInputStream
+import java.io.ObjectOutputStream
 import java.io.OutputStream
+import java.io.Serializable
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromByteArray
-import kotlinx.serialization.encodeToByteArray
-import kotlinx.serialization.protobuf.ProtoBuf
+import kotlinx.coroutines.withContext
 import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.util.Log
@@ -24,14 +21,13 @@ import org.amnezia.vpn.util.Log
 private const val TAG = "VpnState"
 private const val STORE_FILE_NAME = "vpnState"
 
-@Serializable
 data class VpnState(
     val protocolState: ProtocolState,
     val serverName: String? = null,
-    val serverIndex: Int = -1,
-    val vpnProto: VpnProto? = null
-) {
+    val serverIndex: Int = -1
+) : Serializable {
     companion object {
+        private const val serialVersionUID: Long = -1760654961004181606
         val defaultState: VpnState = VpnState(DISCONNECTED)
     }
 }
@@ -41,11 +37,7 @@ object VpnStateStore {
 
     private val dataStore = MultiProcessDataStoreFactory.create(
         serializer = VpnStateSerializer(),
-        produceFile = { app.dataStoreFile(STORE_FILE_NAME) },
-        corruptionHandler = ReplaceFileCorruptionHandler { e ->
-            Log.e(TAG, "VpnState DataStore corrupted: $e")
-            VpnState.defaultState
-        }
+        produceFile = { app.dataStoreFile(STORE_FILE_NAME) }
     )
 
     fun init(app: Application) {
@@ -53,36 +45,36 @@ object VpnStateStore {
         this.app = app
     }
 
-    fun dataFlow(): Flow<VpnState> = dataStore.data.catch { e ->
-        Log.e(TAG, "Failed to read VpnState from store: ${e.message}")
-        emit(VpnState.defaultState)
-    }
-
-    suspend fun getVpnState(): VpnState = dataFlow().firstOrNull() ?: VpnState.defaultState
+    fun dataFlow(): Flow<VpnState> = dataStore.data
 
     suspend fun store(f: (vpnState: VpnState) -> VpnState) {
         try {
             dataStore.updateData(f)
-        } catch (e: Exception) {
+        } catch (e : Exception) {
             Log.e(TAG, "Failed to store VpnState: $e")
-            Log.w(TAG, "Remove DataStore file")
-            app.dataStoreFile(STORE_FILE_NAME).delete()
         }
     }
 }
 
-@OptIn(ExperimentalSerializationApi::class)
 private class VpnStateSerializer : Serializer<VpnState> {
     override val defaultValue: VpnState = VpnState.defaultState
 
-    override suspend fun readFrom(input: InputStream): VpnState = try {
-        ProtoBuf.decodeFromByteArray<VpnState>(input.readBytes())
-    } catch (e: SerializationException) {
-        Log.e(TAG, "Failed to deserialize data: $e")
-        throw CorruptionException("Failed to deserialize data", e)
+    override suspend fun readFrom(input: InputStream): VpnState {
+        return withContext(Dispatchers.IO) {
+            val bios = ByteArrayInputStream(input.readBytes())
+            ObjectInputStream(bios).use {
+                it.readObject() as VpnState
+            }
+        }
     }
 
-    @Suppress("BlockingMethodInNonBlockingContext")
-    override suspend fun writeTo(t: VpnState, output: OutputStream) =
-        output.write(ProtoBuf.encodeToByteArray(t))
+    override suspend fun writeTo(t: VpnState, output: OutputStream) {
+        withContext(Dispatchers.IO) {
+            val baos = ByteArrayOutputStream()
+            ObjectOutputStream(baos).use {
+                it.writeObject(t)
+            }
+            output.write(baos.toByteArray())
+        }
+    }
 }

client/android/src/org/amnezia/vpn/XrayService.kt

@@ -1,3 +0,0 @@
-package org.amnezia.vpn
-
-class XrayService : AmneziaVpnService()

client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt

@@ -1,9 +1,12 @@
 package org.amnezia.vpn.protocol.wireguard
 
+import android.content.Context
 import android.net.VpnService.Builder
 import java.util.TreeMap
+import kotlinx.coroutines.flow.MutableStateFlow
 import org.amnezia.awg.GoBackend
 import org.amnezia.vpn.protocol.Protocol
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.Statistics
@@ -75,8 +78,9 @@ open class Wireguard : Protocol() {
             }
         }
 
-    override fun internalInit() {
-        if (!isInitialized) loadSharedLibrary(context, "wg-go")
+    override fun initialize(context: Context, state: MutableStateFlow<ProtocolState>, onError: (String) -> Unit) {
+        super.initialize(context, state, onError)
+        loadSharedLibrary(context, "wg-go")
     }
 
     override fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {

client/android/xray/build.gradle.kts

@@ -1,19 +0,0 @@
-plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.kotlin.android.get().pluginId)
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-android {
-    namespace = "org.amnezia.vpn.protocol.xray"
-}
-
-dependencies {
-    compileOnly(project(":utils"))
-    compileOnly(project(":protocolApi"))
-    implementation(project(":xray:libXray"))
-    implementation(libs.kotlinx.coroutines)
-}

client/android/xray/libXray/build.gradle.kts

@@ -1,6 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-configurations {
-    maybeCreate("default")
-}
-artifacts.add("default", file("libxray.aar"))

client/android/xray/src/main/kotlin/Xray.kt

@@ -1,237 +0,0 @@
-package org.amnezia.vpn.protocol.xray
-
-import android.content.Context
-import android.net.VpnService.Builder
-import java.io.File
-import java.io.IOException
-import go.Seq
-import org.amnezia.vpn.protocol.Protocol
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.protocol.Statistics
-import org.amnezia.vpn.protocol.VpnStartException
-import org.amnezia.vpn.protocol.xray.libXray.DialerController
-import org.amnezia.vpn.protocol.xray.libXray.LibXray
-import org.amnezia.vpn.protocol.xray.libXray.Logger
-import org.amnezia.vpn.protocol.xray.libXray.Tun2SocksConfig
-import org.amnezia.vpn.util.Log
-import org.amnezia.vpn.util.net.InetNetwork
-import org.amnezia.vpn.util.net.parseInetAddress
-import org.json.JSONObject
-
-/**
- *    Config example:
- * {
- *     "appSplitTunnelType": 0,
- *     "config_version": 0,
- *     "description": "Server 1",
- *     "dns1": "1.1.1.1",
- *     "dns2": "1.0.0.1",
- *     "hostName": "100.100.100.0",
- *     "protocol": "xray",
- *     "splitTunnelApps": [],
- *     "splitTunnelSites": [],
- *     "splitTunnelType": 0,
- *     "xray_config_data": {
- *         "inbounds": [
- *             {
- *                 "listen": "127.0.0.1",
- *                 "port": 8080,
- *                 "protocol": "socks",
- *                 "settings": {
- *                     "udp": true
- *                 }
- *             }
- *         ],
- *         "log": {
- *             "loglevel": "error"
- *         },
- *         "outbounds": [
- *             {
- *                 "protocol": "vless",
- *                 "settings": {
- *                     "vnext": [
- *                         {
- *                             "address": "100.100.100.0",
- *                             "port": 443,
- *                             "users": [
- *                                 {
- *                                     "encryption": "none",
- *                                     "flow": "xtls-rprx-vision",
- *                                     "id": "id"
- *                                 }
- *                             ]
- *                         }
- *                     ]
- *                 },
- *                 "streamSettings": {
- *                     "network": "tcp",
- *                     "realitySettings": {
- *                         "fingerprint": "chrome",
- *                         "publicKey": "publicKey",
- *                         "serverName": "google.com",
- *                         "shortId": "id",
- *                         "spiderX": ""
- *                     },
- *                     "security": "reality"
- *                 }
- *             }
- *         ]
- *     }
- * }
- *
- */
-
-private const val TAG = "Xray"
-private const val LIBXRAY_TAG = "libXray"
-
-class Xray : Protocol() {
-
-    private var isRunning: Boolean = false
-    override val statistics: Statistics = Statistics.EMPTY_STATISTICS
-
-    override fun internalInit() {
-        Seq.setContext(context)
-        if (!isInitialized) {
-            LibXray.initLogger(object : Logger {
-                override fun warning(s: String) = Log.w(LIBXRAY_TAG, s)
-
-                override fun error(s: String) = Log.e(LIBXRAY_TAG, s)
-
-                override fun write(msg: ByteArray): Long {
-                    Log.w(LIBXRAY_TAG, String(msg))
-                    return msg.size.toLong()
-                }
-            }).isNotNullOrBlank { err ->
-                Log.w(TAG, "Failed to initialize logger: $err")
-            }
-        }
-    }
-
-    override fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
-        if (isRunning) {
-            Log.w(TAG, "XRay already running")
-            return
-        }
-
-        val xrayJsonConfig = config.getJSONObject("xray_config_data")
-        val xrayConfig = parseConfig(config, xrayJsonConfig)
-
-        // for debug
-        // xrayJsonConfig.getJSONObject("log").put("loglevel", "debug")
-        xrayJsonConfig.getJSONObject("log").put("loglevel", "warning")
-        // disable access log
-        xrayJsonConfig.getJSONObject("log").put("access", "none")
-
-        // replace socks address
-        // (xrayJsonConfig.getJSONArray("inbounds")[0] as JSONObject).put("listen", "::1")
-
-        start(xrayConfig, xrayJsonConfig.toString(), vpnBuilder, protect)
-        state.value = CONNECTED
-        isRunning = true
-    }
-
-    private fun parseConfig(config: JSONObject, xrayJsonConfig: JSONObject): XrayConfig {
-        return XrayConfig.build {
-            addAddress(XrayConfig.DEFAULT_IPV4_ADDRESS)
-
-            config.optString("dns1").let {
-                if (it.isNotBlank()) addDnsServer(parseInetAddress(it))
-            }
-
-            config.optString("dns2").let {
-                if (it.isNotBlank()) addDnsServer(parseInetAddress(it))
-            }
-
-            addRoute(InetNetwork("0.0.0.0", 0))
-            addRoute(InetNetwork("2000::0", 3))
-            config.getString("hostName").let {
-                excludeRoute(InetNetwork(it, 32))
-            }
-
-            config.optString("mtu").let {
-                if (it.isNotBlank()) setMtu(it.toInt())
-            }
-
-            val socksConfig = xrayJsonConfig.getJSONArray("inbounds")[0] as JSONObject
-            socksConfig.getInt("port").let { setSocksPort(it) }
-
-            configSplitTunneling(config)
-            configAppSplitTunneling(config)
-        }
-    }
-
-    private fun start(config: XrayConfig, configJson: String, vpnBuilder: Builder, protect: (Int) -> Boolean) {
-        buildVpnInterface(config, vpnBuilder)
-
-        DialerController { protect(it.toInt()) }.also {
-            LibXray.registerDialerController(it).isNotNullOrBlank { err ->
-                throw VpnStartException("Failed to register dialer controller: $err")
-            }
-            LibXray.registerListenerController(it).isNotNullOrBlank { err ->
-                throw VpnStartException("Failed to register listener controller: $err")
-            }
-        }
-
-        vpnBuilder.establish().use { tunFd ->
-            if (tunFd == null) {
-                throw VpnStartException("Create VPN interface: permission not granted or revoked")
-            }
-            Log.d(TAG, "Run tun2Socks")
-            runTun2Socks(config, tunFd.detachFd())
-
-            Log.d(TAG, "Run XRay")
-            Log.i(TAG, "xray ${LibXray.xrayVersion()}")
-            val assetsPath = context.getDir("assets", Context.MODE_PRIVATE).absolutePath
-            LibXray.initXray(assetsPath)
-            val geoDir = File(assetsPath, "geo").absolutePath
-            val configPath = File(context.cacheDir, "config.json")
-            Log.d(TAG, "xray.location.asset: $geoDir")
-            Log.d(TAG, "config: $configPath")
-            try {
-                configPath.writeText(configJson)
-            } catch (e: IOException) {
-                LibXray.stopTun2Socks()
-                throw VpnStartException("Failed to write xray config: ${e.message}")
-            }
-            LibXray.runXray(geoDir, configPath.absolutePath, config.maxMemory).isNotNullOrBlank { err ->
-                LibXray.stopTun2Socks()
-                throw VpnStartException("Failed to start xray: $err")
-            }
-        }
-    }
-
-    override fun stopVpn() {
-        LibXray.stopXray().isNotNullOrBlank { err ->
-            Log.e(TAG, "Failed to stop XRay: $err")
-        }
-        LibXray.stopTun2Socks().isNotNullOrBlank { err ->
-            Log.e(TAG, "Failed to stop tun2Socks: $err")
-        }
-
-        isRunning = false
-        state.value = DISCONNECTED
-    }
-
-    override fun reconnectVpn(vpnBuilder: Builder) {
-        state.value = CONNECTED
-    }
-
-    private fun runTun2Socks(config: XrayConfig, fd: Int) {
-        val tun2SocksConfig = Tun2SocksConfig().apply {
-            mtu = config.mtu.toLong()
-            proxy = "socks5://127.0.0.1:${config.socksPort}"
-            device = "fd://$fd"
-            logLevel = "warning"
-        }
-        LibXray.startTun2Socks(tun2SocksConfig, fd.toLong()).isNotNullOrBlank { err ->
-            throw VpnStartException("Failed to start tun2socks: $err")
-        }
-    }
-}
-
-private fun String?.isNotNullOrBlank(block: (String) -> Unit) {
-    if (!this.isNullOrBlank()) {
-        block(this)
-    }
-}

client/android/xray/src/main/kotlin/XrayConfig.kt

@@ -1,42 +0,0 @@
-package org.amnezia.vpn.protocol.xray
-
-import org.amnezia.vpn.protocol.ProtocolConfig
-import org.amnezia.vpn.util.net.InetNetwork
-
-private const val XRAY_DEFAULT_MTU = 1500
-private const val XRAY_DEFAULT_MAX_MEMORY: Long = 50 shl 20 // 50 MB
-
-class XrayConfig protected constructor(
-    protocolConfigBuilder: ProtocolConfig.Builder,
-    val socksPort: Int,
-    val maxMemory: Long,
-) : ProtocolConfig(protocolConfigBuilder) {
-
-    protected constructor(builder: Builder) : this(
-        builder,
-        builder.socksPort,
-        builder.maxMemory
-    )
-
-    class Builder : ProtocolConfig.Builder(false) {
-        internal var socksPort: Int = 0
-            private set
-
-        internal var maxMemory: Long = XRAY_DEFAULT_MAX_MEMORY
-            private set
-
-        override var mtu: Int = XRAY_DEFAULT_MTU
-
-        fun setSocksPort(port: Int) = apply { socksPort = port }
-
-        fun setMaxMemory(maxMemory: Long) = apply { this.maxMemory = maxMemory }
-
-        override fun build(): XrayConfig = configBuild().run { XrayConfig(this@Builder) }
-    }
-
-    companion object {
-        internal val DEFAULT_IPV4_ADDRESS: InetNetwork = InetNetwork("10.0.42.2", 30)
-
-        inline fun build(block: Builder.() -> Unit): XrayConfig = Builder().apply(block).build()
-    }
-}

client/cmake/android.cmake

@@ -52,6 +52,3 @@ foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so
     )
 endforeach()
-
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/xray/android/libxray.aar
-        DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/android/xray/libXray)

client/containers/containers_defs.cpp

@@ -63,14 +63,10 @@ QVector<amnezia::Proto> ContainerProps::protocolsForContainer(amnezia::DockerCon
 
     case DockerContainer::Xray: return { Proto::Xray };
 
-    case DockerContainer::SSXray: return { Proto::SSXray };
-
     case DockerContainer::Dns: return { Proto::Dns };
 
     case DockerContainer::Sftp: return { Proto::Sftp };
 
-    case DockerContainer::Socks5Proxy: return { Proto::Socks5Proxy };
-
     default: return { defaultProtocol(container) };
     }
 }
@@ -96,12 +92,10 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
              { DockerContainer::Awg, "AmneziaWG" },
              { DockerContainer::Xray, "XRay" },
              { DockerContainer::Ipsec, QObject::tr("IPsec") },
-             { DockerContainer::SSXray, "ShadowSocks"},
 
              { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
-             { DockerContainer::Dns, QObject::tr("AmneziaDNS") },
-             { DockerContainer::Sftp, QObject::tr("SFTP file sharing service") },
-             { DockerContainer::Socks5Proxy, QObject::tr("SOCKS5 proxy server") } };
+             { DockerContainer::Dns, QObject::tr("Amnezia DNS") },
+             { DockerContainer::Sftp, QObject::tr("Sftp file sharing service") } };
 }
 
 QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
@@ -110,7 +104,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
                QObject::tr("OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its "
                            "own security protocol with SSL/TLS for key exchange.") },
              { DockerContainer::ShadowSocks,
-               QObject::tr("Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it "
+               QObject::tr("ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it "
                            "may be recognized by analysis systems in some highly censored regions.") },
              { DockerContainer::Cloak,
                QObject::tr("OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against "
@@ -127,16 +121,14 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
                QObject::tr("XRay with REALITY - Suitable for countries with the highest level of internet censorship. "
                            "Traffic masking as web traffic at the TLS level, and protection against detection by active probing methods.") },
              { DockerContainer::Ipsec,
-               QObject::tr("IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after "
+               QObject::tr("IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after "
                            "signal loss. It has native support on the latest versions of Android and iOS.") },
 
              { DockerContainer::TorWebSite, QObject::tr("Deploy a WordPress site on the Tor network in two clicks.") },
              { DockerContainer::Dns,
                QObject::tr("Replace the current DNS server with your own. This will increase your privacy level.") },
              { DockerContainer::Sftp,
-               QObject::tr("Create a file vault on your server to securely store and transfer files.") },
-             { DockerContainer::Socks5Proxy,
-               QObject::tr("") } };
+               QObject::tr("Create a file vault on your server to securely store and transfer files.") } };
 }
 
 QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
@@ -164,6 +156,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
                       "However, certain traffic analysis systems might still detect a Shadowsocks connection. "
                       "Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol.\n\n"
                       "* Available in the AmneziaVPN only on desktop platforms\n"
+                      "* Normal power consumption on mobile devices\n\n"
                       "* Configurable encryption protocol\n"
                       "* Detectable by some DPI systems\n"
                       "* Works over TCP network protocol.") },
@@ -244,8 +237,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
           QObject::tr("After installation, Amnezia will create a\n\n file storage on your server. "
                       "You will be able to access it using\n FileZilla or other SFTP clients, "
                       "as well as mount the disk on your device to access\n it directly from your device.\n\n"
-                      "For more detailed information, you can\n find it in the support section under \"Create SFTP file storage.\" ") },
-        { DockerContainer::Socks5Proxy, QObject::tr("SOCKS5 proxy server") }
+                      "For more detailed information, you can\n find it in the support section under \"Create SFTP file storage.\" ") }
     };
 }
 
@@ -265,12 +257,10 @@ Proto ContainerProps::defaultProtocol(DockerContainer c)
     case DockerContainer::Awg: return Proto::Awg;
     case DockerContainer::Xray: return Proto::Xray;
     case DockerContainer::Ipsec: return Proto::Ikev2;
-    case DockerContainer::SSXray: return Proto::SSXray;
 
     case DockerContainer::TorWebSite: return Proto::TorWebSite;
     case DockerContainer::Dns: return Proto::Dns;
     case DockerContainer::Sftp: return Proto::Sftp;
-    case DockerContainer::Socks5Proxy: return Proto::Socks5Proxy;
     default: return Proto::Any;
     }
 }
@@ -304,7 +294,6 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
     case DockerContainer::ShadowSocks: return false;
     case DockerContainer::Awg: return true;
     case DockerContainer::Cloak: return true;
-    case DockerContainer::Xray: return true;
     default: return false;
     }
 
@@ -374,7 +363,6 @@ bool ContainerProps::isShareable(DockerContainer container)
     case DockerContainer::TorWebSite: return false;
     case DockerContainer::Dns: return false;
     case DockerContainer::Sftp: return false;
-    case DockerContainer::Socks5Proxy: return false;
     default: return true;
     }
 }

client/containers/containers_defs.h

@@ -23,13 +23,11 @@ namespace amnezia
             ShadowSocks,
             Ipsec,
             Xray,
-            SSXray,
 
             // non-vpn
             TorWebSite,
             Dns,
-            Sftp,
-            Socks5Proxy
+            Sftp
         };
         Q_ENUM_NS(DockerContainer)
     } // namespace ContainerEnumNS

client/core/controllers/apiController.cpp

@@ -40,28 +40,6 @@ void ApiController::processApiConfig(const QString &protocol, const ApiControlle
         return;
     } else if (protocol == configKey::awg) {
         config.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey);
-        auto serverConfig = QJsonDocument::fromJson(config.toUtf8()).object();
-        auto containers = serverConfig.value(config_key::containers).toArray();
-        if (containers.isEmpty()) {
-            return;
-        }
-        auto container = containers.at(0).toObject();
-        QString containerName = ContainerProps::containerTypeToString(DockerContainer::Awg);
-        auto containerConfig = container.value(containerName).toObject();
-        auto protocolConfig = QJsonDocument::fromJson(containerConfig.value(config_key::last_config).toString().toUtf8()).object();
-        containerConfig[config_key::junkPacketCount] = protocolConfig.value(config_key::junkPacketCount);
-        containerConfig[config_key::junkPacketMinSize] = protocolConfig.value(config_key::junkPacketMinSize);
-        containerConfig[config_key::junkPacketMaxSize] = protocolConfig.value(config_key::junkPacketMaxSize);
-        containerConfig[config_key::initPacketJunkSize] = protocolConfig.value(config_key::initPacketJunkSize);
-        containerConfig[config_key::responsePacketJunkSize] = protocolConfig.value(config_key::responsePacketJunkSize);
-        containerConfig[config_key::initPacketMagicHeader] = protocolConfig.value(config_key::initPacketMagicHeader);
-        containerConfig[config_key::responsePacketMagicHeader] = protocolConfig.value(config_key::responsePacketMagicHeader);
-        containerConfig[config_key::underloadPacketMagicHeader] = protocolConfig.value(config_key::underloadPacketMagicHeader);
-        containerConfig[config_key::transportPacketMagicHeader] = protocolConfig.value(config_key::transportPacketMagicHeader);
-        container[containerName] = containerConfig;
-        containers.replace(0, container);
-        serverConfig[config_key::containers] = containers;
-        config = QString(QJsonDocument(serverConfig).toJson());
     }
     return;
 }

client/core/controllers/serverController.cpp

@@ -106,7 +106,7 @@ ErrorCode ServerController::runContainerScript(const ServerCredentials &credenti
     if (e)
         return e;
 
-    QString runner = QString("sudo docker exec -i $CONTAINER_NAME %2 %1 ").arg(fileName, (container == DockerContainer::Socks5Proxy ? "sh" : "bash"));
+    QString runner = QString("sudo docker exec -i $CONTAINER_NAME bash %1 ").arg(fileName);
     e = runScript(credentials, replaceVars(runner, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
 
     QString remover = QString("sudo docker exec -i $CONTAINER_NAME rm %1 ").arg(fileName);
@@ -376,10 +376,6 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
             return true;
     }
 
-    if (container == DockerContainer::Socks5Proxy) {
-        return true;
-    }
-
     return false;
 }
 
@@ -420,16 +416,11 @@ ErrorCode ServerController::prepareHostWorker(const ServerCredentials &credentia
 
 ErrorCode ServerController::buildContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config)
 {
-    QString dockerFilePath = amnezia::server::getDockerfileFolder(container) + "/Dockerfile";
-    QString scriptString = QString("sudo rm %1").arg(dockerFilePath);
-    ErrorCode errorCode = runScript(credentials, replaceVars(scriptString, genVarsForScript(credentials, container)));
-    if (errorCode)
-        return errorCode;
+    ErrorCode e = uploadFileToHost(credentials, amnezia::scriptData(ProtocolScriptType::dockerfile, container).toUtf8(),
+                                   amnezia::server::getDockerfileFolder(container) + "/Dockerfile");
 
-    errorCode = uploadFileToHost(credentials, amnezia::scriptData(ProtocolScriptType::dockerfile, container).toUtf8(),dockerFilePath);
-
-    if (errorCode)
-        return errorCode;
+    if (e)
+        return e;
 
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
@@ -437,13 +428,13 @@ ErrorCode ServerController::buildContainerWorker(const ServerCredentials &creden
         return ErrorCode::NoError;
     };
 
-    errorCode = runScript(credentials,
+    e = runScript(credentials,
                   replaceVars(amnezia::scriptData(SharedScriptType::build_container), genVarsForScript(credentials, container, config)),
                   cbReadStdOut);
-    if (errorCode)
-        return errorCode;
+    if (e)
+        return e;
 
-    return errorCode;
+    return e;
 }
 
 ErrorCode ServerController::runContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config)
@@ -520,7 +511,6 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     const QJsonObject &amneziaWireguarConfig = config.value(ProtocolProps::protoToString(Proto::Awg)).toObject();
     const QJsonObject &xrayConfig = config.value(ProtocolProps::protoToString(Proto::Xray)).toObject();
     const QJsonObject &sftpConfig = config.value(ProtocolProps::protoToString(Proto::Sftp)).toObject();
-    const QJsonObject &socks5ProxyConfig = config.value(ProtocolProps::protoToString(Proto::Socks5Proxy)).toObject();
 
     Vars vars;
 
@@ -618,14 +608,6 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$UNDERLOAD_PACKET_MAGIC_HEADER", amneziaWireguarConfig.value(config_key::underloadPacketMagicHeader).toString() } });
     vars.append({ { "$TRANSPORT_PACKET_MAGIC_HEADER", amneziaWireguarConfig.value(config_key::transportPacketMagicHeader).toString() } });
 
-    // Socks5 proxy vars
-    vars.append({ { "$SOCKS5_PROXY_PORT", socks5ProxyConfig.value(config_key::port).toString(protocols::socks5Proxy::defaultPort) } });
-    auto username =  socks5ProxyConfig.value(config_key:: userName).toString();
-    auto password = socks5ProxyConfig.value(config_key::password).toString();
-    QString socks5user = (!username.isEmpty() && !password.isEmpty()) ? QString("users %1:CL:%2").arg(username, password) : "";
-    vars.append({ { "$SOCKS5_USER",  socks5user } });
-    vars.append({ { "$SOCKS5_AUTH_TYPE",  socks5user.isEmpty() ? "none" : "strong" } });
-
     QString serverIp = NetworkUtilities::getIPAddress(credentials.hostName);
     if (!serverIp.isEmpty()) {
         vars.append({ { "$SERVER_IP_ADDRESS", serverIp } });
@@ -704,30 +686,6 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
     for (auto &port : fixedPorts) {
         script = script.append("|:%1").arg(port);
     }
-
-    if (transportProto == "tcpandudp") {
-        QString tcpProtoScript = script;
-        QString udpProtoScript = script;
-        tcpProtoScript.append("' | grep -i tcp");
-        udpProtoScript.append("' | grep -i udp");
-        tcpProtoScript.append(" | grep LISTEN");
-
-        ErrorCode errorCode = runScript(credentials, replaceVars(tcpProtoScript, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
-        if (errorCode != ErrorCode::NoError) {
-            return errorCode;
-        }
-
-        errorCode = runScript(credentials, replaceVars(udpProtoScript, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
-        if (errorCode != ErrorCode::NoError) {
-            return errorCode;
-        }
-
-        if (!stdOut.isEmpty()) {
-            return ErrorCode::ServerPortAlreadyAllocatedError;
-        }
-        return ErrorCode::NoError;
-    }
-
     script = script.append("' | grep -i %1").arg(transportProto);
 
     if (transportProto == "tcp") {

client/core/controllers/vpnConfigurationController.cpp

@@ -24,7 +24,6 @@ QScopedPointer<ConfiguratorBase> VpnConfigurationsController::createConfigurator
     case Proto::Awg: return QScopedPointer<ConfiguratorBase>(new AwgConfigurator(m_settings, m_serverController));
     case Proto::Ikev2: return QScopedPointer<ConfiguratorBase>(new Ikev2Configurator(m_settings, m_serverController));
     case Proto::Xray: return QScopedPointer<ConfiguratorBase>(new XrayConfigurator(m_settings, m_serverController));
-    case Proto::SSXray: return QScopedPointer<ConfiguratorBase>(new XrayConfigurator(m_settings, m_serverController));
     default: return QScopedPointer<ConfiguratorBase>();
     }
 }

client/core/errorstrings.cpp

@@ -9,7 +9,7 @@ QString errorString(ErrorCode code) {
 
     // General error codes
     case(ErrorCode::NoError): errorMessage = QObject::tr("No error"); break;
-    case(ErrorCode::UnknownError): errorMessage = QObject::tr("Unknown error"); break;
+    case(ErrorCode::UnknownError): errorMessage = QObject::tr("Unknown Error"); break;
     case(ErrorCode::NotImplementedError): errorMessage = QObject::tr("Function not implemented"); break;
     case(ErrorCode::AmneziaServiceNotRunning): errorMessage = QObject::tr("Background service is not running"); break;
 
@@ -23,15 +23,15 @@ QString errorString(ErrorCode code) {
     case(ErrorCode::ServerPacketManagerError): errorMessage = QObject::tr("Server error: Packet manager error"); break;
 
     // Libssh errors
-    case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;
-    case(ErrorCode::SshInterruptedError): errorMessage = QObject::tr("SSH request was interrupted"); break;
-    case(ErrorCode::SshInternalError): errorMessage = QObject::tr("SSH internal error"); break;
+    case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("Ssh request was denied"); break;
+    case(ErrorCode::SshInterruptedError): errorMessage = QObject::tr("Ssh request was interrupted"); break;
+    case(ErrorCode::SshInternalError): errorMessage = QObject::tr("Ssh internal error"); break;
     case(ErrorCode::SshPrivateKeyError): errorMessage = QObject::tr("Invalid private key or invalid passphrase entered"); break;
     case(ErrorCode::SshPrivateKeyFormatError): errorMessage = QObject::tr("The selected private key format is not supported, use openssh ED25519 key types or PEM key types"); break;
     case(ErrorCode::SshTimeoutError): errorMessage = QObject::tr("Timeout connecting to server"); break;
 
     // Ssh scp errors
-    case(ErrorCode::SshScpFailureError): errorMessage = QObject::tr("SCP error: Generic failure"); break;
+    case(ErrorCode::SshScpFailureError): errorMessage = QObject::tr("Scp error: Generic failure"); break;
 
     // Local errors
     case (ErrorCode::OpenVpnConfigMissing): errorMessage = QObject::tr("OpenVPN config missing"); break;
@@ -39,7 +39,7 @@ QString errorString(ErrorCode code) {
 
     // Distro errors
     case (ErrorCode::OpenVpnExecutableMissing): errorMessage = QObject::tr("OpenVPN executable missing"); break;
-    case (ErrorCode::ShadowSocksExecutableMissing): errorMessage = QObject::tr("Shadowsocks (ss-local) executable missing"); break;
+    case (ErrorCode::ShadowSocksExecutableMissing): errorMessage = QObject::tr("ShadowSocks (ss-local) executable missing"); break;
     case (ErrorCode::CloakExecutableMissing): errorMessage = QObject::tr("Cloak (ck-client) executable missing"); break;
     case (ErrorCode::AmneziaServiceConnectionFailed): errorMessage = QObject::tr("Amnezia helper service error"); break;
     case (ErrorCode::OpenSslFailed): errorMessage = QObject::tr("OpenSSL failed"); break;

client/core/scripts_registry.cpp

@@ -18,7 +18,6 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container)
     case DockerContainer::TorWebSite: return QLatin1String("website_tor");
     case DockerContainer::Dns: return QLatin1String("dns");
     case DockerContainer::Sftp: return QLatin1String("sftp");
-    case DockerContainer::Socks5Proxy: return QLatin1String("socks5_proxy");
     default: return QString();
     }
 }

client/core/serialization/inbound.cpp

@@ -1,38 +0,0 @@
-#include <QString>
-#include <QJsonObject>
-#include <QList>
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include "transfer.h"
-#include "serialization.h"
-
-namespace amnezia::serialization::inbounds
-{
-
-//"inbounds": [
-//                 {
-//                     "listen": "127.0.0.1",
-//                     "port": 10808,
-//                     "protocol": "socks",
-//                     "settings": {
-//                         "udp": true
-//                     }
-//                 }
-//],
-
-const static QString listen = "127.0.0.1";
-const static int port = 10808;
-const static QString protocol = "socks";
-
-QJsonObject GenerateInboundEntry()
-{
-    QJsonObject root;
-    QJsonIO::SetValue(root, listen, "listen");
-    QJsonIO::SetValue(root, port, "port");
-    QJsonIO::SetValue(root, protocol, "protocol");
-    QJsonIO::SetValue(root, true, "settings", "udp");
-    return root;
-}
-
-
-} // namespace amnezia::serialization::inbounds
-

client/core/serialization/outbound.cpp

@@ -1,122 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-#include <QString>
-#include <QJsonObject>
-#include <QList>
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include "transfer.h"
-#include "serialization.h"
-
-namespace amnezia::serialization::outbounds
-{
-QJsonObject GenerateFreedomOUT(const QString &domainStrategy, const QString &redirect)
-{
-    QJsonObject root;
-    JADD(domainStrategy, redirect)
-    return root;
-}
-
-QJsonObject GenerateBlackHoleOUT(bool useHTTP)
-{
-    QJsonObject root;
-    QJsonObject resp;
-    resp.insert("type", useHTTP ? "http" : "none");
-    root.insert("response", resp);
-    return root;
-}
-
-QJsonObject GenerateShadowSocksServerOUT(const QString &address, int port, const QString &method, const QString &password)
-{
-    QJsonObject root;
-    JADD(address, port, method, password)
-    return root;
-}
-
-QJsonObject GenerateShadowSocksOUT(const QList<ShadowSocksServerObject> &_servers)
-{
-    QJsonObject root;
-    QJsonArray x;
-
-    for (const auto &server : _servers)
-    {
-        x.append(GenerateShadowSocksServerOUT(server.address, server.port, server.method, server.password));
-    }
-
-    root.insert("servers", x);
-    return root;
-}
-
-QJsonObject GenerateHTTPSOCKSOut(const QString &addr, int port, bool useAuth, const QString &username, const QString &password)
-{
-    QJsonObject root;
-    QJsonIO::SetValue(root, addr, "servers", 0, "address");
-    QJsonIO::SetValue(root, port, "servers", 0, "port");
-    if (useAuth)
-    {
-        QJsonIO::SetValue(root, username, "servers", 0, "users", 0, "user");
-        QJsonIO::SetValue(root, password, "servers", 0, "users", 0, "pass");
-    }
-    return root;
-}
-
-QJsonObject GenerateOutboundEntry(const QString &tag, const QString &protocol, const QJsonObject &settings, const QJsonObject &streamSettings,
-                                  const QJsonObject &mux, const QString &sendThrough)
-{
-    QJsonObject root;
-    JADD(sendThrough, protocol, settings, tag, streamSettings, mux)
-    return root;
-}
-
-QJsonObject GenerateTrojanOUT(const QList<TrojanObject> &_servers)
-{
-    QJsonObject root;
-    QJsonArray x;
-
-    for (const auto &server : _servers)
-    {
-        x.append(GenerateTrojanServerOUT(server.address, server.port, server.password));
-    }
-
-    root.insert("servers", x);
-    return root;
-}
-
-QJsonObject GenerateTrojanServerOUT(const QString &address, int port, const QString &password)
-{
-    QJsonObject root;
-    JADD(address, port, password)
-    return root;
-}
-
-} // namespace amnezia::serialization::outbounds
-

client/core/serialization/serialization.h

@@ -1,66 +0,0 @@
-#ifndef SERIALIZATION_H
-#define SERIALIZATION_H
-
-#include <QJsonObject>
-#include "transfer.h"
-
-namespace amnezia::serialization
-{
-    namespace vmess
-    {
-        QJsonObject Deserialize(const QString &vmess, QString *alias, QString *errMessage);
-        const QString Serialize(const StreamSettingsObject &transfer, const VMessServerObject &server, const QString &alias);
-    } // namespace vmess
-
-    namespace vmess_new
-    {
-        QJsonObject Deserialize(const QString &vmess, QString *alias, QString *errMessage);
-        const QString Serialize(const StreamSettingsObject &transfer, const VMessServerObject &server, const QString &alias);
-    } // namespace vmess_new
-
-    namespace vless
-    {
-        QJsonObject Deserialize(const QString &vless, QString *alias, QString *errMessage);
-    } // namespace vless
-
-    namespace ss
-    {
-        QJsonObject Deserialize(const QString &ss, QString *alias, QString *errMessage);
-        const QString Serialize(const ShadowSocksServerObject &server, const QString &alias, bool isSip002);
-    } // namespace ss
-
-    namespace ssd
-    {
-        QList<std::pair<QString, QJsonObject>> Deserialize(const QString &uri, QString *groupName, QStringList *logList);
-    } // namespace ssd
-
-    namespace trojan
-    {
-        QJsonObject Deserialize(const QString &trojan, QString *alias, QString *errMessage);
-        const QString Serialize(const TrojanObject &server, const QString &alias);
-    } // namespace trojan
-
-    namespace outbounds
-    {
-        QJsonObject GenerateFreedomOUT(const QString &domainStrategy, const QString &redirect);
-        QJsonObject GenerateBlackHoleOUT(bool useHTTP);
-        QJsonObject GenerateShadowSocksOUT(const QList<ShadowSocksServerObject> &servers);
-        QJsonObject GenerateShadowSocksServerOUT(const QString &address, int port, const QString &method, const QString &password);
-        QJsonObject GenerateHTTPSOCKSOut(const QString &address, int port, bool useAuth, const QString &username, const QString &password);
-        QJsonObject GenerateTrojanOUT(const QList<TrojanObject> &servers);
-        QJsonObject GenerateTrojanServerOUT(const QString &address, int port, const QString &password);
-        QJsonObject GenerateOutboundEntry(const QString &tag,                //
-                                       const QString &protocol,           //
-                                       const QJsonObject &settings,   //
-                                       const QJsonObject &streamSettings, //
-                                       const QJsonObject &mux = {},       //
-                                       const QString &sendThrough = "0.0.0.0");
-    } // namespace outbounds
-
-    namespace inbounds
-    {
-        QJsonObject GenerateInboundEntry();
-    }
-}
-
-#endif // SERIALIZATION_H

client/core/serialization/ss.cpp

@@ -1,142 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include "3rd/QJsonStruct/QJsonStruct.hpp"
-#include "utilities.h"
-#include "serialization.h"
-
-#define OUTBOUND_TAG_PROXY "PROXY"
-#define JADD(...) FOR_EACH(JADDEx, __VA_ARGS__)
-
-namespace amnezia::serialization::ss
-{
-QJsonObject Deserialize(const QString &ssUri, QString *alias, QString *errMessage)
-{
-    ShadowSocksServerObject server;
-    QString d_name;
-
-    // auto ssUri = _ssUri.toStdString();
-    if (ssUri.length() < 5)
-    {
-        *errMessage = QObject::tr("SS URI is too short");
-    }
-
-    auto uri = ssUri.mid(5);
-    auto hashPos = uri.lastIndexOf("#");
-
-    if (hashPos >= 0)
-    {
-        // Get the name/remark
-        d_name = uri.mid(uri.lastIndexOf("#") + 1);
-        uri.truncate(hashPos);
-    }
-
-    auto atPos = uri.indexOf('@');
-
-    if (atPos < 0)
-    {
-        // Old URI scheme
-        QString decoded = QByteArray::fromBase64(uri.toUtf8(), QByteArray::Base64Option::OmitTrailingEquals);
-        auto colonPos = decoded.indexOf(':');
-
-        if (colonPos < 0)
-        {
-            *errMessage = QObject::tr("Can't find the colon separator between method and password");
-        }
-
-        server.method = decoded.left(colonPos);
-        decoded.remove(0, colonPos + 1);
-        atPos = decoded.lastIndexOf('@');
-
-        if (atPos < 0)
-        {
-            *errMessage = QObject::tr("Can't find the at separator between password and hostname");
-        }
-
-        server.password = decoded.mid(0, atPos);
-        decoded.remove(0, atPos + 1);
-        colonPos = decoded.lastIndexOf(':');
-
-        if (colonPos < 0)
-        {
-            *errMessage = QObject::tr("Can't find the colon separator between hostname and port");
-        }
-
-        server.address = decoded.mid(0, colonPos);
-        server.port = decoded.mid(colonPos + 1).toInt();
-    }
-    else
-    {
-        // SIP002 URI scheme
-        auto x = QUrl::fromUserInput(uri);
-        server.address = x.host();
-        server.port = x.port();
-        const auto userInfo = Utils::SafeBase64Decode(x.userName());
-        const auto userInfoSp = userInfo.indexOf(':');
-
-        if (userInfoSp < 0)
-        {
-            *errMessage = QObject::tr("Can't find the colon separator between method and password");
-            return QJsonObject{};
-        }
-
-        const auto method = userInfo.mid(0, userInfoSp);
-        server.method = method;
-        server.password = userInfo.mid(userInfoSp + 1);
-    }
-
-    d_name = QUrl::fromPercentEncoding(d_name.toUtf8());
-    QJsonObject root;
-    QJsonArray outbounds;
-    outbounds.append(outbounds::GenerateOutboundEntry(OUTBOUND_TAG_PROXY, "shadowsocks", outbounds::GenerateShadowSocksOUT({ server }), {}));
-    JADD(outbounds)
-    QJsonObject inbound = inbounds::GenerateInboundEntry();
-    root["inbounds"] = QJsonArray{ inbound };
-    *alias = alias->isEmpty() ? d_name : *alias + "_" + d_name;
-    return root;
-}
-
-const QString Serialize(const ShadowSocksServerObject &server, const QString &alias, bool)
-{
-    QUrl url;
-    const auto plainUserInfo = server.method + ":" + server.password;
-    const auto userinfo = plainUserInfo.toUtf8().toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-    url.setUserInfo(userinfo);
-    url.setScheme("ss");
-    url.setHost(server.address);
-    url.setPort(server.port);
-    url.setFragment(alias);
-    return url.toString(QUrl::ComponentFormattingOption::FullyEncoded);
-}
-} // namespace amnezia::serialization::ss
-

client/core/serialization/ssd.cpp

@@ -1,244 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-/**
- * A Naive SSD Decoder for Qv2ray
- *
- * @author DuckSoft <realducksoft@gmail.com>
- * @copyright Licensed under GPLv3.
- */
-
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include "3rd/QJsonStruct/QJsonStruct.hpp"
-#include "utilities.h"
-#include "serialization.h"
-
-const inline QString QV2RAY_SSD_DEFAULT_NAME_PATTERN = "%1 - %2 (rate %3)";
-#define OUTBOUND_TAG_PROXY "PROXY"
-
-namespace amnezia::serialization::ssd
-{
-    // These below are super strict checking schemes, but necessary.
-#define MUST_EXIST(fieldName)                                                                                                                        \
-if (!obj.contains((fieldName)) || obj[(fieldName)].isUndefined() || obj[(fieldName)].isNull())                                                       \
-    {                                                                                                                                                \
-            *logList << QObject::tr("Invalid ssd link: json: field %1 must exist").arg(fieldName);                                                   \
-            return {};                                                                                                                               \
-    }
-#define MUST_PORT(fieldName)                                                                                                                         \
-MUST_EXIST(fieldName);                                                                                                                               \
-if (int value = obj[(fieldName)].toInt(-1); value < 0 || value > 65535)                                                                              \
-    {                                                                                                                                                \
-        *logList << QObject::tr("Invalid ssd link: json: field %1 must be valid port number");                                                       \
-        return {};                                                                                                                                   \
-    }
-#define MUST_STRING(fieldName)                                                                                                                       \
-MUST_EXIST(fieldName);                                                                                                                               \
-if (!obj[(fieldName)].isString())                                                                                                                    \
-    {                                                                                                                                                \
-        *logList << QObject::tr("Invalid ssd link: json: field %1 must be of type 'string'").arg(fieldName);                                         \
-        return {};                                                                                                                                   \
-    }
-#define MUST_ARRAY(fieldName)                                                                                                                        \
-MUST_EXIST(fieldName);                                                                                                                               \
-if (!obj[(fieldName)].isArray())                                                                                                                     \
-    {                                                                                                                                                \
-        *logList << QObject::tr("Invalid ssd link: json: field %1 must be an array").arg(fieldName);                                                 \
-        return {};                                                                                                                                   \
-    }
-
-#define SERVER_SHOULD_BE_OBJECT(server)                                                                                                              \
-if (!server.isObject())                                                                                                                              \
-    {                                                                                                                                                \
-        *logList << QObject::tr("Skipping invalid ssd server: server must be an object");                                                            \
-        continue;                                                                                                                                    \
-    }
-#define SHOULD_EXIST(fieldName)                                                                                                                      \
-if (serverObject[(fieldName)].isUndefined())                                                                                                         \
-    {                                                                                                                                                \
-        *logList << QObject::tr("Skipping invalid ssd server: missing required field %1").arg(fieldName);                                            \
-        continue;                                                                                                                                    \
-    }
-#define SHOULD_STRING(fieldName)                                                                                                                     \
-SHOULD_EXIST(fieldName);                                                                                                                             \
-if (!serverObject[(fieldName)].isString())                                                                                                           \
-    {                                                                                                                                                \
-        *logList << QObject::tr("Skipping invalid ssd server: field %1 should be of type 'string'").arg(fieldName);                                  \
-        continue;                                                                                                                                    \
-    }
-
-QList<std::pair<QString, QJsonObject>> Deserialize(const QString &uri, QString *groupName, QStringList *logList)
-{
-    // ssd links should begin with "ssd://"
-    if (!uri.startsWith("ssd://"))
-    {
-        *logList << QObject::tr("Invalid ssd link: should begin with ssd://");
-        return {};
-    }
-
-    // decode base64
-    const auto ssdURIBody = uri.mid(6, uri.length() - 6); //(&uri, 6, uri.length() - 6);
-    const auto decodedJSON = Utils::SafeBase64Decode(ssdURIBody).toUtf8();
-
-    if (decodedJSON.length() == 0)
-    {
-        *logList << QObject::tr("Invalid ssd link: base64 parse failed");
-        return {};
-    }
-
-    const auto decodeError = Utils::VerifyJsonString(decodedJSON);
-    if (!decodeError.isEmpty())
-    {
-        *logList << QObject::tr("Invalid ssd link: json parse failed");
-        return {};
-    }
-
-    // casting to object
-    const auto obj = Utils::JsonFromString(decodedJSON);
-
-    // obj.airport
-    MUST_STRING("airport");
-    *groupName = obj["airport"].toString();
-
-    // obj.port
-    MUST_PORT("port");
-    const int port = obj["port"].toInt();
-
-    // obj.encryption
-    MUST_STRING("encryption");
-    const auto encryption = obj["encryption"].toString();
-
-    // check: rc4-md5 is not supported by v2ray-core
-    // TODO: more checks, including all algorithms
-    if (encryption.toLower() == "rc4-md5")
-    {
-        *logList << QObject::tr("Invalid ssd link: rc4-md5 encryption is not supported by v2ray-core");
-        return {};
-    }
-
-    // obj.password
-    MUST_STRING("password");
-    const auto password = obj["password"].toString();
-    // obj.servers
-    MUST_ARRAY("servers");
-    //
-    QList<std::pair<QString, QJsonObject>> serverList;
-    //
-
-    // iterate through the servers
-    for (const auto &server : obj["servers"].toArray())
-    {
-        SERVER_SHOULD_BE_OBJECT(server);
-        const auto serverObject = server.toObject();
-        ShadowSocksServerObject ssObject;
-
-        // encryption
-        ssObject.method = encryption;
-
-        // password
-        ssObject.password = password;
-
-        // address :-> "server"
-        SHOULD_STRING("server");
-        const auto serverAddress = serverObject["server"].toString();
-        ssObject.address = serverAddress;
-
-        // port selection:
-        //   normal:     use global settings
-        //   overriding: use current config
-        if (serverObject["port"].isUndefined())
-        {
-            ssObject.port = port;
-        }
-        else if (auto currPort = serverObject["port"].toInt(-1); (currPort >= 0 && currPort <= 65535))
-        {
-            ssObject.port = currPort;
-        }
-        else
-        {
-            ssObject.port = port;
-        }
-
-        // name decision:
-        //   untitled: using server:port as name
-        //   entitled: using given name
-        QString nodeName;
-        if (serverObject["remarks"].isUndefined())
-        {
-            nodeName = QString("%1:%2").arg(ssObject.address).arg(ssObject.port);
-        }
-        else if (serverObject["remarks"].isString())
-        {
-            nodeName = serverObject["remarks"].toString();
-        }
-        else
-        {
-            nodeName = QString("%1:%2").arg(ssObject.address).arg(ssObject.port);
-        }
-
-        // ratio decision:
-        //   unspecified: ratio = 1
-        //   specified:   use given value
-        double ratio = 1.0;
-        if (auto currRatio = serverObject["ratio"].toDouble(-1.0); currRatio != -1.0)
-        {
-            ratio = currRatio;
-        }
-        //  else if (!serverObject["ratio"].isUndefined())
-        //  {
-        //      //*logList << QObject::tr("Invalid ratio encountered. using fallback value.");
-        //  }
-
-        // format the total name of the node.
-        const auto finalName = QV2RAY_SSD_DEFAULT_NAME_PATTERN.arg(*groupName, nodeName).arg(ratio);
-        // appending to the total list
-        QJsonObject root;
-        QJsonArray outbounds;
-        QJsonObject inbound = inbounds::GenerateInboundEntry();
-        outbounds.append(outbounds::GenerateOutboundEntry(OUTBOUND_TAG_PROXY, "shadowsocks", outbounds::GenerateShadowSocksOUT({ ssObject }), {}));
-        root["outbounds"] = outbounds;
-        root["inbounds"] = QJsonArray{ inbound };
-        serverList.append({ finalName, root });
-    }
-
-    // returns the current result
-    return serverList;
-}
-#undef MUST_EXIST
-#undef MUST_PORT
-#undef MUST_ARRAY
-#undef MUST_STRING
-#undef SERVER_SHOULD_BE_OBJECT
-#undef SHOULD_EXIST
-#undef SHOULD_STRING
-} // namespace amnezia::serialization::ssd
-

client/core/serialization/transfer.h

@@ -1,313 +0,0 @@
-#ifndef TRANSFER_H
-#define TRANSFER_H
-
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include "3rd/QJsonStruct/QJsonStruct.hpp"
-
-#define JADDEx(field) root.insert(#field, field);
-#define JADD(...) FOR_EACH(JADDEx, __VA_ARGS__)
-
-constexpr auto VMESS_USER_ALTERID_DEFAULT = 0;
-
-namespace amnezia::serialization {
-
-struct ShadowSocksServerObject
-{
-    QString address;
-    QString method;
-    QString password;
-    int port;
-    JSONSTRUCT_COMPARE(ShadowSocksServerObject, address, method, password)
-    JSONSTRUCT_REGISTER(ShadowSocksServerObject, F(address, port, method, password))
-};
-
-
-struct VMessServerObject
-{
-    struct UserObject
-    {
-        QString id;
-        int alterId = VMESS_USER_ALTERID_DEFAULT;
-        QString security = "auto";
-        int level = 0;
-        JSONSTRUCT_COMPARE(UserObject, id, alterId, security, level)
-        JSONSTRUCT_REGISTER(UserObject, F(id, alterId, security, level))
-    };
-
-    QString address;
-    int port;
-    QList<UserObject> users;
-    JSONSTRUCT_COMPARE(VMessServerObject, address, port, users)
-    JSONSTRUCT_REGISTER(VMessServerObject, F(address, port, users))
-};
-
-
-namespace transfer
-{
-
-struct HTTPRequestObject
-{
-    QString version = "1.1";
-    QString method = "GET";
-    QList<QString> path = { "/" };
-    QMap<QString, QList<QString>> headers;
-    HTTPRequestObject()
-    {
-        headers = {
-            { "Host", { "www.baidu.com", "www.bing.com" } },
-            { "User-Agent",
-             { "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36",
-              "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46" } },
-            { "Accept-Encoding", { "gzip, deflate" } },
-            { "Connection", { "keep-alive" } },
-            { "Pragma", { "no-cache" } }
-        };
-    }
-    JSONSTRUCT_COMPARE(HTTPRequestObject, version, method, path, headers)
-    JSONSTRUCT_REGISTER(HTTPRequestObject, F(version, method, path, headers))
-};
-//
-//
-struct HTTPResponseObject
-{
-    QString version = "1.1";
-    QString status = "200";
-    QString reason = "OK";
-    QMap<QString, QList<QString>> headers;
-    HTTPResponseObject()
-    {
-        headers = { { "Content-Type", { "application/octet-stream", "video/mpeg" } }, //
-                   { "Transfer-Encoding", { "chunked" } },                           //
-                   { "Connection", { "keep-alive" } },                               //
-                   { "Pragma", { "no-cache" } } };
-    }
-    JSONSTRUCT_COMPARE(HTTPResponseObject, version, status, reason, headers)
-    JSONSTRUCT_REGISTER(HTTPResponseObject, F(version, status, reason, headers))
-};
-//
-//
-struct TCPHeader_Internal
-{
-    QString type = "none";
-    HTTPRequestObject request;
-    HTTPResponseObject response;
-    JSONSTRUCT_COMPARE(TCPHeader_Internal, type, request, response)
-    JSONSTRUCT_REGISTER(TCPHeader_Internal, A(type), F(request, response))
-};
-//
-//
-struct ObfsHeaderObject
-{
-    QString type = "none";
-    JSONSTRUCT_COMPARE(ObfsHeaderObject, type)
-    JSONSTRUCT_REGISTER(ObfsHeaderObject, F(type))
-};
-//
-//
-struct TCPObject
-{
-    TCPHeader_Internal header;
-    JSONSTRUCT_COMPARE(TCPObject, header)
-    JSONSTRUCT_REGISTER(TCPObject, F(header))
-};
-//
-//
-struct KCPObject
-{
-    int mtu = 1350;
-    int tti = 50;
-    int uplinkCapacity = 5;
-    int downlinkCapacity = 20;
-    bool congestion = false;
-    int readBufferSize = 2;
-    int writeBufferSize = 2;
-    QString seed;
-    ObfsHeaderObject header;
-    KCPObject(){};
-    JSONSTRUCT_COMPARE(KCPObject, mtu, tti, uplinkCapacity, downlinkCapacity, congestion, readBufferSize, writeBufferSize, seed, header)
-    JSONSTRUCT_REGISTER(KCPObject, F(mtu, tti, uplinkCapacity, downlinkCapacity, congestion, readBufferSize, writeBufferSize, header, seed))
-};
-//
-//
-struct WebSocketObject
-{
-    QString path = "/";
-    QMap<QString, QString> headers;
-    int maxEarlyData = 0;
-    bool useBrowserForwarding = false;
-    QString earlyDataHeaderName;
-    JSONSTRUCT_COMPARE(WebSocketObject, path, headers, maxEarlyData, useBrowserForwarding, earlyDataHeaderName)
-    JSONSTRUCT_REGISTER(WebSocketObject, F(path, headers, maxEarlyData, useBrowserForwarding, earlyDataHeaderName))
-};
-//
-//
-struct HttpObject
-{
-    QList<QString> host;
-    QString path = "/";
-    QString method = "PUT";
-    QMap<QString, QList<QString>> headers;
-    JSONSTRUCT_COMPARE(HttpObject, host, path, method, headers)
-    JSONSTRUCT_REGISTER(HttpObject, F(host, path, method, headers))
-};
-//
-//
-struct DomainSocketObject
-{
-    QString path = "/";
-    JSONSTRUCT_COMPARE(DomainSocketObject, path)
-    JSONSTRUCT_REGISTER(DomainSocketObject, F(path))
-};
-//
-//
-struct QuicObject
-{
-    QString security = "none";
-    QString key;
-    ObfsHeaderObject header;
-    JSONSTRUCT_COMPARE(QuicObject, security, key, header)
-    JSONSTRUCT_REGISTER(QuicObject, F(security, key, header))
-};
-//
-//
-struct gRPCObject
-{
-    QString serviceName;
-    bool multiMode = false;
-    JSONSTRUCT_COMPARE(gRPCObject, serviceName, multiMode)
-    JSONSTRUCT_REGISTER(gRPCObject, F(serviceName, multiMode))
-};
-
-//
-//
-struct SockoptObject
-{
-    int mark = 0;
-    bool tcpFastOpen = false;
-    QString tproxy = "off";
-    int tcpKeepAliveInterval = 0;
-    JSONSTRUCT_COMPARE(SockoptObject, mark, tcpFastOpen, tproxy, tcpKeepAliveInterval)
-    JSONSTRUCT_REGISTER(SockoptObject, F(mark, tcpFastOpen, tproxy, tcpKeepAliveInterval))
-};
-//
-//
-struct CertificateObject
-{
-    QString usage = "encipherment";
-    QString certificateFile;
-    QString keyFile;
-    QList<QString> certificate;
-    QList<QString> key;
-    JSONSTRUCT_COMPARE(CertificateObject, usage, certificateFile, keyFile, certificate, key)
-    JSONSTRUCT_REGISTER(CertificateObject, F(usage, certificateFile, keyFile, certificate, key))
-};
-//
-//
-struct TLSObject
-{
-    QString serverName;
-    bool allowInsecure = false;
-    bool enableSessionResumption = false;
-    bool disableSystemRoot = false;
-    QList<QString> alpn;
-    QList<QString> pinnedPeerCertificateChainSha256;
-    QList<CertificateObject> certificates;
-    JSONSTRUCT_COMPARE(TLSObject, serverName, allowInsecure, enableSessionResumption, disableSystemRoot, alpn,
-                       pinnedPeerCertificateChainSha256, certificates)
-    JSONSTRUCT_REGISTER(TLSObject, F(serverName, allowInsecure, enableSessionResumption, disableSystemRoot, alpn,
-                                     pinnedPeerCertificateChainSha256, certificates))
-};
-//
-//
-struct XTLSObject
-{
-    QString serverName;
-    bool allowInsecure = false;
-    bool enableSessionResumption = false;
-    bool disableSystemRoot = false;
-    QList<QString> alpn;
-    QList<CertificateObject> certificates;
-    JSONSTRUCT_COMPARE(XTLSObject, serverName, allowInsecure, enableSessionResumption, disableSystemRoot, alpn, certificates)
-    JSONSTRUCT_REGISTER(XTLSObject, F(serverName, allowInsecure, enableSessionResumption, disableSystemRoot, alpn, certificates))
-};
-} // namespace transfer
-
-//
-//
-struct TrojanObject
-{
-    quint16 port;
-    QString address;
-    QString password;
-    QString sni;
-    bool ignoreCertificate = false;
-    bool ignoreHostname = false;
-    bool reuseSession = false;
-    bool sessionTicket = false;
-    bool reusePort = false;
-    bool tcpFastOpen = false;
-
-#define _X(name) json[#name] = name
-    QJsonObject toJson() const
-    {
-        QJsonObject json;
-        _X(port);
-        _X(address);
-        _X(password);
-        _X(sni);
-        _X(ignoreCertificate);
-        _X(ignoreHostname);
-        _X(reuseSession);
-        _X(reusePort);
-        _X(sessionTicket);
-        _X(tcpFastOpen);
-        return json;
-    };
-#undef _X
-
-#define _X(name, type) name = root[#name].to##type()
-    void loadJson(const QJsonObject &root)
-    {
-        _X(port, Int);
-        _X(address, String);
-        _X(password, String);
-        _X(sni, String);
-        _X(ignoreHostname, Bool);
-        _X(ignoreCertificate, Bool);
-        _X(reuseSession, Bool);
-        _X(reusePort, Bool);
-        _X(sessionTicket, Bool);
-        _X(tcpFastOpen, Bool);
-    }
-#undef _X
-
-    [[nodiscard]] static TrojanObject fromJson(const QJsonObject &root)
-    {
-        TrojanObject o;
-        o.loadJson(root);
-        return o;
-    }
-};
-
-struct StreamSettingsObject
-{
-    QString network = "tcp";
-    QString security = "none";
-    transfer::SockoptObject sockopt;
-    transfer::TLSObject tlsSettings;
-    transfer::XTLSObject xtlsSettings;
-    transfer::TCPObject tcpSettings;
-    transfer::KCPObject kcpSettings;
-    transfer::WebSocketObject wsSettings;
-    transfer::HttpObject httpSettings;
-    transfer::DomainSocketObject dsSettings;
-    transfer::QuicObject quicSettings;
-    transfer::gRPCObject grpcSettings;
-    JSONSTRUCT_COMPARE(StreamSettingsObject, network, security, sockopt, //
-                       tcpSettings, tlsSettings, xtlsSettings, kcpSettings, wsSettings, httpSettings, dsSettings, quicSettings, grpcSettings)
-    JSONSTRUCT_REGISTER(StreamSettingsObject, F(network, security, sockopt),
-                        F(tcpSettings, tlsSettings, xtlsSettings, kcpSettings, wsSettings, httpSettings, dsSettings, quicSettings, grpcSettings))
-};
-
-}
-#endif //TRANSFER_H

client/core/serialization/trojan.cpp

@@ -1,271 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include <QUrlQuery>
-#include "serialization.h"
-
-#define OUTBOUND_TAG_PROXY "PROXY"
-
-namespace amnezia::serialization::trojan
-{
-
-const QString Serialize(const TrojanObject &object, const QString &alias)
-{
-
-    QUrlQuery query;
-    if (object.ignoreHostname)
-        query.addQueryItem("allowInsecureHostname", "1");
-    if (object.ignoreCertificate)
-        query.addQueryItem("allowInsecureCertificate", "1");
-    if (object.sessionTicket)
-        query.addQueryItem("sessionTicket", "1");
-    if (object.ignoreCertificate || object.ignoreHostname)
-        query.addQueryItem("allowInsecure", "1");
-    if (object.tcpFastOpen)
-        query.addQueryItem("tfo", "1");
-
-    if (!object.sni.isEmpty())
-        query.addQueryItem("sni", object.sni);
-
-    QUrl link;
-    if (!object.password.isEmpty())
-        link.setUserName(object.password, QUrl::DecodedMode);
-    link.setPort(object.port);
-    link.setHost(object.address);
-    link.setFragment(alias);
-    link.setQuery(query);
-    link.setScheme("trojan");
-
-    return link.toString(QUrl::FullyEncoded);
-}
-
-QJsonObject Deserialize(const QString &trojanUri, QString *alias, QString *errMessage)
-{
-    const QString prefix = "trojan://";
-    if (!trojanUri.startsWith(prefix))
-    {
-        *errMessage = ("Invalid Trojan URI");
-        return {};
-    }
-    //
-    const auto trueList = QStringList{ "true", "1", "yes", "y" };
-    const QUrl trojanUrl(trojanUri.trimmed());
-    const QUrlQuery query(trojanUrl.query());
-    *alias = trojanUrl.fragment(QUrl::FullyDecoded);
-
-    auto getQueryValue = [&](const QString &key) {
-        return query.queryItemValue(key, QUrl::FullyDecoded);
-    };
-    //
-    TrojanObject result;
-    result.address = trojanUrl.host();
-    result.password = QUrl::fromPercentEncoding(trojanUrl.userInfo().toUtf8());
-    result.port = trojanUrl.port();
-    // process sni (and also "peer")
-    if (query.hasQueryItem("sni"))
-    {
-        result.sni = getQueryValue("sni");
-    }
-    else if (query.hasQueryItem("peer"))
-    {
-        // This is evil and may be removed in a future version.
-        qWarning() << "use of 'peer' in trojan url is deprecated";
-        result.sni = getQueryValue("peer");
-    }
-    else
-    {
-        // Use the hostname
-        result.sni = result.address;
-    }
-
-
-    //
-    result.tcpFastOpen = trueList.contains(getQueryValue("tfo").toLower());
-    result.sessionTicket = trueList.contains(getQueryValue("sessionTicket").toLower());
-    //
-    bool allowAllInsecure = trueList.contains(getQueryValue("allowInsecure").toLower());
-    result.ignoreHostname = allowAllInsecure || trueList.contains(getQueryValue("allowInsecureHostname").toLower());
-    result.ignoreCertificate = allowAllInsecure || trueList.contains(getQueryValue("allowInsecureCertificate").toLower());
-
-    QJsonObject stream;
-    // handle type
-    const auto hasType = query.hasQueryItem("type");
-    const auto type = hasType ? query.queryItemValue("type") : "tcp";
-    if (type != "tcp")
-        QJsonIO::SetValue(stream, type, "network");
-
-
-    // type-wise settings
-    if (type == "kcp")
-    {
-        const auto hasSeed = query.hasQueryItem("seed");
-        if (hasSeed)
-            QJsonIO::SetValue(stream, query.queryItemValue("seed"), { "kcpSettings", "seed" });
-
-        const auto hasHeaderType = query.hasQueryItem("headerType");
-        const auto headerType = hasHeaderType ? query.queryItemValue("headerType") : "none";
-        if (headerType != "none")
-            QJsonIO::SetValue(stream, headerType, { "kcpSettings", "header", "type" });
-    }
-    else if (type == "http")
-    {
-        const auto hasPath = query.hasQueryItem("path");
-        const auto path = hasPath ? QUrl::fromPercentEncoding(query.queryItemValue("path").toUtf8()) : "/";
-        if (path != "/")
-            QJsonIO::SetValue(stream, path, { "httpSettings", "path" });
-
-        const auto hasHost = query.hasQueryItem("host");
-        if (hasHost)
-        {
-            const auto hosts = QJsonArray::fromStringList(query.queryItemValue("host").split(","));
-            QJsonIO::SetValue(stream, hosts, { "httpSettings", "host" });
-        }
-    }
-    else if (type == "ws")
-    {
-        const auto hasPath = query.hasQueryItem("path");
-        const auto path = hasPath ? QUrl::fromPercentEncoding(query.queryItemValue("path").toUtf8()) : "/";
-        if (path != "/")
-            QJsonIO::SetValue(stream, path, { "wsSettings", "path" });
-
-        const auto hasHost = query.hasQueryItem("host");
-        if (hasHost)
-        {
-            QJsonIO::SetValue(stream, query.queryItemValue("host"), { "wsSettings", "headers", "Host" });
-        }
-    }
-    else if (type == "quic")
-    {
-        const auto hasQuicSecurity = query.hasQueryItem("quicSecurity");
-        if (hasQuicSecurity)
-        {
-            const auto quicSecurity = query.queryItemValue("quicSecurity");
-            QJsonIO::SetValue(stream, quicSecurity, { "quicSettings", "security" });
-
-            if (quicSecurity != "none")
-            {
-                const auto key = query.queryItemValue("key");
-                QJsonIO::SetValue(stream, key, { "quicSettings", "key" });
-            }
-
-            const auto hasHeaderType = query.hasQueryItem("headerType");
-            const auto headerType = hasHeaderType ? query.queryItemValue("headerType") : "none";
-            if (headerType != "none")
-                QJsonIO::SetValue(stream, headerType, { "quicSettings", "header", "type" });
-        }
-    }
-    else if (type == "grpc")
-    {
-        const auto hasServiceName = query.hasQueryItem("serviceName");
-        if (hasServiceName)
-        {
-            const auto serviceName = QUrl::fromPercentEncoding(query.queryItemValue("serviceName").toUtf8());
-            QJsonIO::SetValue(stream, serviceName, { "grpcSettings", "serviceName" });
-        }
-
-        const auto hasMode = query.hasQueryItem("mode");
-        if (hasMode)
-        {
-            const auto multiMode = QUrl::fromPercentEncoding(query.queryItemValue("mode").toUtf8()) == "multi";
-            QJsonIO::SetValue(stream, multiMode, { "grpcSettings", "multiMode" });
-        }
-    }
-
-    // tls-wise settings
-    const auto hasSecurity = query.hasQueryItem("security");
-    const auto security = hasSecurity ? query.queryItemValue("security") : "none";
-    const auto tlsKey = security == "xtls" ? "xtlsSettings" : ( security == "tls" ? "tlsSettings" : "realitySettings" );
-    if (security != "none")
-    {
-        QJsonIO::SetValue(stream, security, "security");
-    }
-    // sni
-    const auto hasSNI = query.hasQueryItem("sni");
-    if (hasSNI)
-    {
-        const auto sni = query.queryItemValue("sni");
-        QJsonIO::SetValue(stream, sni, { tlsKey, "serverName" });
-    }
-    // alpn
-    const auto hasALPN = query.hasQueryItem("alpn");
-    if (hasALPN)
-    {
-        const auto alpnRaw = QUrl::fromPercentEncoding(query.queryItemValue("alpn").toUtf8());
-        QStringList aplnElems = alpnRaw.split(",");
-        // h2 protocol is not supported by xray
-        aplnElems.removeAll("h2");
-        if (!aplnElems.isEmpty()) {
-            const auto alpnArray = QJsonArray::fromStringList(aplnElems);
-            QJsonIO::SetValue(stream, alpnArray, { tlsKey, "alpn" });
-        }
-    }
-
-    if (security == "reality")
-    {
-        if (query.hasQueryItem("fp"))
-        {
-            const auto fp = QUrl::fromPercentEncoding(query.queryItemValue("fp").toUtf8());
-            QJsonIO::SetValue(stream, fp, { "realitySettings", "fingerprint" });
-        }
-        if (query.hasQueryItem("pbk"))
-        {
-            const auto pbk = QUrl::fromPercentEncoding(query.queryItemValue("pbk").toUtf8());
-            QJsonIO::SetValue(stream, pbk, { "realitySettings", "publicKey" });
-        }
-        if (query.hasQueryItem("spiderX"))
-        {
-            const auto spiderX = QUrl::fromPercentEncoding(query.queryItemValue("spiderX").toUtf8());
-            QJsonIO::SetValue(stream, spiderX, { "realitySettings", "spiderX" });
-        }
-        if (query.hasQueryItem("sid"))
-        {
-            const auto sid = QUrl::fromPercentEncoding(query.queryItemValue("sid").toUtf8());
-            QJsonIO::SetValue(stream, sid, { "realitySettings", "shortId" });
-        }
-    }
-
-    QJsonObject root;
-    QJsonArray outbounds;
-    QJsonObject outbound = outbounds::GenerateOutboundEntry(OUTBOUND_TAG_PROXY, "trojan", outbounds::GenerateTrojanOUT({ result }), {});
-    outbound["streamSettings"] = stream;
-    outbounds.append(outbound);
-    JADD(outbounds)
-    QJsonObject inbound = inbounds::GenerateInboundEntry();
-    root["inbounds"] = QJsonArray { inbound };
-
-    return root;
-}
-
-} // namespace amnezia::serialization::trojan
-

client/core/serialization/vless.cpp

@@ -1,256 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include <QUrlQuery>
-#include "serialization.h"
-
-namespace amnezia::serialization::vless
-{
-QJsonObject Deserialize(const QString &str, QString *alias, QString *errMessage)
-{
-    // must start with vless://
-    if (!str.startsWith("vless://"))
-    {
-        *errMessage = QObject::tr("VLESS link should start with vless://");
-        return QJsonObject();
-    }
-
-    // parse url
-    QUrl url(str);
-    if (!url.isValid())
-    {
-        *errMessage = QObject::tr("link parse failed: %1").arg(url.errorString());
-        return QJsonObject();
-    }
-
-    // fetch host
-    const auto hostRaw = url.host();
-    if (hostRaw.isEmpty())
-    {
-        *errMessage = QObject::tr("empty host");
-        return QJsonObject();
-    }
-    const auto host = (hostRaw.startsWith('[') && hostRaw.endsWith(']')) ? hostRaw.mid(1, hostRaw.length() - 2) : hostRaw;
-
-    // fetch port
-    const auto port = url.port();
-    if (port == -1)
-    {
-        *errMessage = QObject::tr("missing port");
-        return QJsonObject();
-    }
-
-    // fetch remarks
-    const auto remarks = url.fragment();
-    if (!remarks.isEmpty())
-    {
-        *alias = remarks;
-    }
-
-    // fetch uuid
-    const auto uuid = url.userInfo();
-    if (uuid.isEmpty())
-    {
-        *errMessage = QObject::tr("missing uuid");
-        return QJsonObject();
-    }
-
-    // initialize QJsonObject with basic info
-    QJsonObject outbound;
-    QJsonObject stream;
-
-    QJsonIO::SetValue(outbound, "vless", "protocol");
-    QJsonIO::SetValue(outbound, host, { "settings", "vnext", 0, "address" });
-    QJsonIO::SetValue(outbound, port, { "settings", "vnext", 0, "port" });
-    QJsonIO::SetValue(outbound, uuid, { "settings", "vnext", 0, "users", 0, "id" });
-
-    // parse query
-    QUrlQuery query(url.query());
-
-    // handle type
-    const auto hasType = query.hasQueryItem("type");
-    const auto type = hasType ? query.queryItemValue("type") : "tcp";
-    if (type != "tcp")
-        QJsonIO::SetValue(stream, type, "network");
-
-    // handle encryption
-    const auto hasEncryption = query.hasQueryItem("encryption");
-    const auto encryption = hasEncryption ? query.queryItemValue("encryption") : "none";
-    QJsonIO::SetValue(outbound, encryption, { "settings", "vnext", 0, "users", 0, "encryption" });
-
-    // type-wise settings
-    if (type == "kcp")
-    {
-        const auto hasSeed = query.hasQueryItem("seed");
-        if (hasSeed)
-            QJsonIO::SetValue(stream, query.queryItemValue("seed"), { "kcpSettings", "seed" });
-
-        const auto hasHeaderType = query.hasQueryItem("headerType");
-        const auto headerType = hasHeaderType ? query.queryItemValue("headerType") : "none";
-        if (headerType != "none")
-            QJsonIO::SetValue(stream, headerType, { "kcpSettings", "header", "type" });
-    }
-    else if (type == "http")
-    {
-        const auto hasPath = query.hasQueryItem("path");
-        const auto path = hasPath ? QUrl::fromPercentEncoding(query.queryItemValue("path").toUtf8()) : "/";
-        if (path != "/")
-            QJsonIO::SetValue(stream, path, { "httpSettings", "path" });
-
-        const auto hasHost = query.hasQueryItem("host");
-        if (hasHost)
-        {
-            const auto hosts = QJsonArray::fromStringList(query.queryItemValue("host").split(","));
-            QJsonIO::SetValue(stream, hosts, { "httpSettings", "host" });
-        }
-    }
-    else if (type == "ws")
-    {
-        const auto hasPath = query.hasQueryItem("path");
-        const auto path = hasPath ? QUrl::fromPercentEncoding(query.queryItemValue("path").toUtf8()) : "/";
-        if (path != "/")
-            QJsonIO::SetValue(stream, path, { "wsSettings", "path" });
-
-        const auto hasHost = query.hasQueryItem("host");
-        if (hasHost)
-        {
-            QJsonIO::SetValue(stream, query.queryItemValue("host"), { "wsSettings", "headers", "Host" });
-        }
-    }
-    else if (type == "quic")
-    {
-        const auto hasQuicSecurity = query.hasQueryItem("quicSecurity");
-        if (hasQuicSecurity)
-        {
-            const auto quicSecurity = query.queryItemValue("quicSecurity");
-            QJsonIO::SetValue(stream, quicSecurity, { "quicSettings", "security" });
-
-            if (quicSecurity != "none")
-            {
-                const auto key = query.queryItemValue("key");
-                QJsonIO::SetValue(stream, key, { "quicSettings", "key" });
-            }
-
-            const auto hasHeaderType = query.hasQueryItem("headerType");
-            const auto headerType = hasHeaderType ? query.queryItemValue("headerType") : "none";
-            if (headerType != "none")
-                QJsonIO::SetValue(stream, headerType, { "quicSettings", "header", "type" });
-        }
-    }
-    else if (type == "grpc")
-    {
-        const auto hasServiceName = query.hasQueryItem("serviceName");
-        if (hasServiceName)
-        {
-            const auto serviceName = QUrl::fromPercentEncoding(query.queryItemValue("serviceName").toUtf8());
-            QJsonIO::SetValue(stream, serviceName, { "grpcSettings", "serviceName" });
-        }
-
-        const auto hasMode = query.hasQueryItem("mode");
-        if (hasMode)
-        {
-            const auto multiMode = QUrl::fromPercentEncoding(query.queryItemValue("mode").toUtf8()) == "multi";
-            QJsonIO::SetValue(stream, multiMode, { "grpcSettings", "multiMode" });
-        }
-    }
-
-    // tls-wise settings
-    const auto hasSecurity = query.hasQueryItem("security");
-    const auto security = hasSecurity ? query.queryItemValue("security") : "none";
-    const auto tlsKey = security == "xtls" ? "xtlsSettings" : ( security == "tls" ? "tlsSettings" : "realitySettings" );
-    if (security != "none")
-    {
-        QJsonIO::SetValue(stream, security, "security");
-    }
-    // sni
-    const auto hasSNI = query.hasQueryItem("sni");
-    if (hasSNI)
-    {
-        const auto sni = query.queryItemValue("sni");
-        QJsonIO::SetValue(stream, sni, { tlsKey, "serverName" });
-    }
-    // alpn
-    const auto hasALPN = query.hasQueryItem("alpn");
-    if (hasALPN)
-    {
-        const auto alpnRaw = QUrl::fromPercentEncoding(query.queryItemValue("alpn").toUtf8());
-        QStringList aplnElems = alpnRaw.split(",");
-        // h2 protocol is not supported by xray
-        aplnElems.removeAll("h2");
-        if (!aplnElems.isEmpty()) {
-            const auto alpnArray = QJsonArray::fromStringList(aplnElems);
-            QJsonIO::SetValue(stream, alpnArray, { tlsKey, "alpn" });
-        }
-    }
-    // xtls-specific
-    if (security == "xtls" || security == "reality")
-    {
-        const auto flow = query.queryItemValue("flow");
-        QJsonIO::SetValue(outbound, flow, { "settings", "vnext", 0, "users", 0, "flow" });
-    }
-
-    if (security == "reality")
-    {
-        if (query.hasQueryItem("fp"))
-        {
-            const auto fp = QUrl::fromPercentEncoding(query.queryItemValue("fp").toUtf8());
-            QJsonIO::SetValue(stream, fp, { "realitySettings", "fingerprint" });
-        }
-        if (query.hasQueryItem("pbk"))
-        {
-            const auto pbk = QUrl::fromPercentEncoding(query.queryItemValue("pbk").toUtf8());
-            QJsonIO::SetValue(stream, pbk, { "realitySettings", "publicKey" });
-        }
-        if (query.hasQueryItem("spiderX"))
-        {
-            const auto spiderX = QUrl::fromPercentEncoding(query.queryItemValue("spiderX").toUtf8());
-            QJsonIO::SetValue(stream, spiderX, { "realitySettings", "spiderX" });
-        }
-        if (query.hasQueryItem("sid"))
-        {
-            const auto sid = QUrl::fromPercentEncoding(query.queryItemValue("sid").toUtf8());
-            QJsonIO::SetValue(stream, sid, { "realitySettings", "shortId" });
-        }
-    }
-
-    // assembling config
-    QJsonObject root;
-    outbound["streamSettings"] = stream;
-    QJsonObject inbound = inbounds::GenerateInboundEntry();
-    root["outbounds"] = QJsonArray{ outbound };
-    root["inbounds"] = QJsonArray { inbound };
-    return root;
-}
-} // namespace amnezia::serialization::vless
-

client/core/serialization/vmess.cpp

@@ -1,344 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-#include "3rd/QJsonStruct/QJsonStruct.hpp"
-#include <QJsonDocument>
-#include "transfer.h"
-#include "utilities.h"
-#include "serialization.h"
-
-#define nothing
-
-#define OUTBOUND_TAG_PROXY "PROXY"
-
-namespace amnezia::serialization::vmess
-{
-// From https://github.com/2dust/v2rayN/wiki/分享链接格式说明(ver-2)
-const QString Serialize(const StreamSettingsObject &transfer, const VMessServerObject &server, const QString &alias)
-{
-    QJsonObject vmessUriRoot;
-    // Constant
-    vmessUriRoot["v"] = 2;
-    vmessUriRoot["ps"] = alias;
-    vmessUriRoot["add"] = server.address;
-    vmessUriRoot["port"] = server.port;
-    vmessUriRoot["id"] = server.users.front().id;
-    vmessUriRoot["aid"] = server.users.front().alterId;
-    const auto scy = server.users.front().security;
-    vmessUriRoot["scy"] = (scy == "aes-128-gcm" || scy == "chacha20-poly1305" || scy == "none" || scy == "zero") ? scy : "auto";
-    vmessUriRoot["net"] = transfer.network == "http" ? "h2" : transfer.network;
-    vmessUriRoot["tls"] = (transfer.security == "tls" || transfer.security == "xtls") ? "tls" : "none";
-    if (transfer.security == "tls")
-    {
-        vmessUriRoot["sni"] = transfer.tlsSettings.serverName;
-    }
-    else if (transfer.security == "xtls")
-    {
-        vmessUriRoot["sni"] = transfer.xtlsSettings.serverName;
-    }
-
-    if (transfer.network == "tcp")
-    {
-        vmessUriRoot["type"] = transfer.tcpSettings.header.type;
-    }
-    else if (transfer.network == "kcp")
-    {
-        vmessUriRoot["type"] = transfer.kcpSettings.header.type;
-    }
-    else if (transfer.network == "quic")
-    {
-        vmessUriRoot["type"] = transfer.quicSettings.header.type;
-        vmessUriRoot["host"] = transfer.quicSettings.security;
-        vmessUriRoot["path"] = transfer.quicSettings.key;
-    }
-    else if (transfer.network == "ws")
-    {
-        auto x = transfer.wsSettings.headers;
-        auto host = x.contains("host");
-        auto CapHost = x.contains("Host");
-        auto realHost = host ? x["host"] : (CapHost ? x["Host"] : "");
-        //
-        vmessUriRoot["host"] = realHost;
-        vmessUriRoot["path"] = transfer.wsSettings.path;
-    }
-    else if (transfer.network == "h2" || transfer.network == "http")
-    {
-        vmessUriRoot["host"] = transfer.httpSettings.host.join(",");
-        vmessUriRoot["path"] = transfer.httpSettings.path;
-    }
-    else if (transfer.network == "grpc")
-    {
-        vmessUriRoot["path"] = transfer.grpcSettings.serviceName;
-    }
-
-    if (!vmessUriRoot.contains("type") || vmessUriRoot["type"].toString().isEmpty())
-    {
-        vmessUriRoot["type"] = "none";
-    }
-
-    //
-    QString jString = Utils::JsonToString(vmessUriRoot, QJsonDocument::JsonFormat::Compact);
-    auto vmessPart = jString.toUtf8().toBase64();
-    return "vmess://" + vmessPart;
-}
-
-// This generates global config containing only one outbound....
-QJsonObject Deserialize(const QString &vmessStr, QString *alias, QString *errMessage)
-{
-#define default QJsonObject()
-    QString vmess = vmessStr;
-
-    if (vmess.trimmed() != vmess)
-    {
-        vmess = vmessStr.trimmed();
-    }
-
-    // Reset errMessage
-    *errMessage = "";
-
-    if (!vmess.toLower().startsWith("vmess://"))
-    {
-        *errMessage = QObject::tr("VMess string should start with 'vmess://'");
-        return default;
-    }
-
-    const auto b64Str = vmess.mid(8, vmess.length() - 8);
-    if (b64Str.isEmpty())
-    {
-        *errMessage = QObject::tr("VMess string should be a valid base64 string");
-        return default;
-    }
-
-    auto vmessString = Utils::SafeBase64Decode(b64Str);
-    auto jsonErr = Utils::VerifyJsonString(vmessString);
-
-    if (!jsonErr.isEmpty())
-    {
-        *errMessage = jsonErr;
-        return default;
-    }
-
-    auto vmessConf = Utils::JsonFromString(vmessString);
-
-    if (vmessConf.isEmpty())
-    {
-        *errMessage = QObject::tr("JSON should not be empty");
-        return default;
-    }
-
-    // --------------------------------------------------------------------------------------
-    QJsonObject root;
-    QString ps, add, id, net, type, host, path, tls, scy, sni;
-    int port, aid;
-    //
-    // __vmess_checker__func(key, values)
-    //
-    //   - Key     =    Key in JSON and the variable name.
-    //   - Values  =    Candidate variable list, if not match, the first one is used as default.
-    //
-    //   - [[val.size() <= 1]] is used when only the default value exists.
-    //
-    //   - It can be empty, if so,           if the key is not in the JSON, or the value is empty,  report an error.
-    //   - Else if it contains one thing.    if the key is not in the JSON, or the value is empty,  use that one.
-    //   - Else if it contains many things,  when the key IS in the JSON but not within the THINGS, use the first in the THINGS
-    //   - Else -------------------------------------------->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  use the JSON value
-    //
-#define __vmess_checker__func(key, values)                                                                                                               \
-    {                                                                                                                                                    \
-            auto val = QStringList() values;                                                                                                             \
-            if (vmessConf.contains(#key) && !vmessConf[#key].toVariant().toString().trimmed().isEmpty() &&                                               \
-                (val.size() <= 1 || val.contains(vmessConf[#key].toVariant().toString())))                                                               \
-        {                                                                                                                                                \
-                key = vmessConf[#key].toVariant().toString();                                                                                            \
-        }                                                                                                                                                \
-            else if (!val.isEmpty())                                                                                                                     \
-        {                                                                                                                                                \
-                key = val.first();                                                                                                                       \
-        }                                                                                                                                                \
-            else                                                                                                                                         \
-        {                                                                                                                                                \
-                *errMessage = QObject::tr(#key " does not exist.");                                                                                      \
-        }                                                                                                                                                \
-    }
-
-    // vmess v1 upgrader
-    if (!vmessConf.contains("v"))
-    {
-        qDebug() << "Detected deprecated vmess v1. Trying to upgrade...";
-        if (const auto network = vmessConf["net"].toString(); network == "ws" || network == "h2")
-        {
-            const QStringList hostComponents = vmessConf["host"].toString().replace(" ", "").split(";");
-            if (const auto nParts = hostComponents.length(); nParts == 1)
-                vmessConf["path"] = hostComponents[0], vmessConf["host"] = "";
-            else if (nParts == 2)
-                vmessConf["path"] = hostComponents[0], vmessConf["host"] = hostComponents[1];
-            else
-                vmessConf["path"] = "/", vmessConf["host"] = "";
-        }
-    }
-
-    // Strict check of VMess protocol, to check if the specified value
-    // is in the correct range.
-    //
-    // Get Alias (AKA ps) from address and port.
-    {
-        // Some idiot vmess:// links are using alterId...
-        aid = vmessConf.contains("aid") ? vmessConf.value("aid").toInt(VMESS_USER_ALTERID_DEFAULT) :
-                  vmessConf.value("alterId").toInt(VMESS_USER_ALTERID_DEFAULT);
-        //
-        //
-        __vmess_checker__func(ps, << vmessConf["add"].toVariant().toString() + ":" + vmessConf["port"].toVariant().toString()); //
-        __vmess_checker__func(add, nothing);                                                                                    //
-        __vmess_checker__func(id, nothing);                                                                                     //
-        __vmess_checker__func(scy, << "aes-128-gcm"                                                                             //
-                                   << "chacha20-poly1305"                                                                       //
-                                   << "auto"                                                                                    //
-                                   << "none"                                                                                    //
-                                   << "zero");                                                                                  //
-        //
-        __vmess_checker__func(type, << "none"                                                                                   //
-                                    << "http"                                                                                   //
-                                    << "srtp"                                                                                   //
-                                    << "utp"                                                                                    //
-                                    << "wechat-video");                                                                         //
-        //
-        __vmess_checker__func(net, << "tcp"                                                                                     //
-                                   << "http"                                                                                    //
-                                   << "h2"                                                                                      //
-                                   << "ws"                                                                                      //
-                                   << "kcp"                                                                                     //
-                                   << "quic"                                                                                    //
-                                   << "grpc");                                                                                  //
-        //
-        __vmess_checker__func(tls, << "none"                                                                                    //
-                                   << "tls");                                                                                   //
-        //
-        path = vmessConf.contains("path") ? vmessConf["path"].toVariant().toString() : (net == "quic" ? "" : "/");
-        host = vmessConf.contains("host") ? vmessConf["host"].toVariant().toString() : (net == "quic" ? "none" : "");
-    }
-
-    // Respect connection type rather than obfs type
-    if (QStringList{ "srtp", "utp", "wechat-video" }.contains(type)) //
-    {                                                                //
-        if (net != "quic" && net != "kcp")                           //
-        {                                                            //
-            type = "none";                                           //
-        }                                                            //
-    }
-
-    port = vmessConf["port"].toVariant().toInt();
-    aid = vmessConf["aid"].toVariant().toInt();
-    //
-    // Apply the settings.
-    // User
-    VMessServerObject::UserObject user;
-    user.id = id;
-    user.alterId = aid;
-    user.security = scy;
-    //
-    // Server
-    VMessServerObject serv;
-    serv.port = port;
-    serv.address = add;
-    serv.users.push_back(user);
-    //
-    //
-    // Stream Settings
-    StreamSettingsObject streaming;
-
-    if (net == "tcp")
-    {
-        streaming.tcpSettings.header.type = type;
-    }
-    else if (net == "http" || net == "h2")
-    {
-        // Fill hosts for HTTP
-        for (const auto &_host : host.split(','))
-        {
-            if (!_host.isEmpty())
-            {
-                streaming.httpSettings.host << _host.trimmed();
-            }
-        }
-
-        streaming.httpSettings.path = path;
-    }
-    else if (net == "ws")
-    {
-        if (!host.isEmpty())
-            streaming.wsSettings.headers["Host"] = host;
-        streaming.wsSettings.path = path;
-    }
-    else if (net == "kcp")
-    {
-        streaming.kcpSettings.header.type = type;
-    }
-    else if (net == "quic")
-    {
-        streaming.quicSettings.security = host;
-        streaming.quicSettings.header.type = type;
-        streaming.quicSettings.key = path;
-    }
-    else if (net == "grpc")
-    {
-        streaming.grpcSettings.serviceName = path;
-    }
-
-    streaming.security = tls;
-    if (tls == "tls")
-    {
-        if (sni.isEmpty() && !host.isEmpty())
-            sni = host;
-        streaming.tlsSettings.serverName = sni;
-        streaming.tlsSettings.allowInsecure = false;
-    }
-    //
-    // Network type
-    // NOTE(DuckSoft): Damn vmess:// just don't write 'http' properly
-    if (net == "h2")
-        net = "http";
-    streaming.network = net;
-    //
-    // VMess root config
-    QJsonObject vConf;
-    vConf["vnext"] = QJsonArray{ serv.toJson() };
-    const auto outbound = outbounds::GenerateOutboundEntry(OUTBOUND_TAG_PROXY, "vmess", vConf, streaming.toJson());
-    QJsonObject inbound = inbounds::GenerateInboundEntry();
-    root["outbounds"] = QJsonArray{ outbound };
-    root["inbounds"] = QJsonArray{ inbound };
-    // If previous alias is empty, just the PS is needed, else, append a "_"
-    *alias = alias->trimmed().isEmpty() ? ps : *alias + "_" + ps;
-    return root;
-#undef default
-}
-} // namespace amnezia::serialization::vmess
-

client/core/serialization/vmess_new.cpp

@@ -1,172 +0,0 @@
-// Copyright (c) Qv2ray, A Qt frontend for V2Ray. Written in C++.
-// This file is part of the Qv2ray VPN client.
-//
-// Qv2ray, A Qt frontend for V2Ray. Written in C++
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-// Copyright (c) 2024 AmneziaVPN
-// This file has been modified for AmneziaVPN
-//
-// This file is based on the work of the Qv2ray VPN client.
-// The original code of the Qv2ray, A Qt frontend for V2Ray. Written in C++ and licensed under GPL3.
-//
-// The modified version of this file is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this file. If not, see <https://www.gnu.org/licenses/>.
-
-#include "3rd/QJsonStruct/QJsonIO.hpp"
-#include "3rd/QJsonStruct/QJsonStruct.hpp"
-#include "transfer.h"
-#include "serialization.h"
-
-#include <QUrlQuery>
-
-#define OUTBOUND_TAG_PROXY "PROXY"
-
-namespace amnezia::serialization::vmess_new
-{
-const static QStringList NetworkType{ "tcp", "http", "ws", "kcp", "quic", "grpc" };
-const static QStringList QuicSecurityTypes{ "none", "aes-128-gcm", "chacha20-poly1305" };
-const static QStringList QuicKcpHeaderTypes{ "none", "srtp", "utp", "wechat-video", "dtls", "wireguard" };
-const static QStringList FalseTypes{ "false", "False", "No", "Off", "0" };
-
-QJsonObject Deserialize(const QString &vmessStr, QString *alias, QString *errMessage)
-{
-    QUrl url{ vmessStr };
-    QUrlQuery query{ url };
-    //
-#define default QJsonObject()
-    if (!url.isValid())
-    {
-        *errMessage = QObject::tr("vmess:// url is invalid");
-        return default;
-    }
-
-    // If previous alias is empty, just the PS is needed, else, append a "_"
-    const auto name = url.fragment(QUrl::FullyDecoded).trimmed();
-    *alias = alias->isEmpty() ? name : (*alias + "_" + name);
-
-    VMessServerObject server;
-    server.users << VMessServerObject::UserObject{};
-
-    StreamSettingsObject stream;
-    QString net;
-    bool tls = false;
-    // Check streamSettings
-    {
-        for (const auto &_protocol : url.userName().split("+"))
-        {
-            if (_protocol == "tls")
-                tls = true;
-            else
-                net = _protocol;
-        }
-        if (!NetworkType.contains(net))
-        {
-            *errMessage = QObject::tr("Invalid streamSettings protocol: ") + net;
-            return default;
-        }
-        stream.network = net;
-        stream.security = tls ? "tls" : "";
-    }
-    // Host Port UUID AlterID
-    {
-        const auto host = url.host();
-        int port = url.port();
-        QString uuid;
-        int aid;
-        {
-            const auto pswd = url.password();
-            const auto index = pswd.lastIndexOf("-");
-            uuid = pswd.mid(0, index);
-            aid = pswd.right(pswd.length() - index - 1).toInt();
-        }
-        server.address = host;
-        server.port = port;
-        server.users.first().id = uuid;
-        server.users.first().alterId = aid;
-        server.users.first().security = "auto";
-    }
-
-    const static auto getQueryValue = [&query](const QString &key, const QString &defaultValue) {
-        if (query.hasQueryItem(key))
-            return query.queryItemValue(key, QUrl::FullyDecoded);
-        else
-            return defaultValue;
-    };
-
-    //
-    // Begin transport settings parser
-    {
-        if (net == "tcp")
-        {
-            stream.tcpSettings.header.type = getQueryValue("type", "none");
-        }
-        else if (net == "http")
-        {
-            stream.httpSettings.host.append(getQueryValue("host", ""));
-            stream.httpSettings.path = getQueryValue("path", "/");
-        }
-        else if (net == "ws")
-        {
-            stream.wsSettings.headers["Host"] = getQueryValue("host", "");
-            stream.wsSettings.path = getQueryValue("path", "/");
-        }
-        else if (net == "kcp")
-        {
-            stream.kcpSettings.seed = getQueryValue("seed", "");
-            stream.kcpSettings.header.type = getQueryValue("type", "none");
-        }
-        else if (net == "quic")
-        {
-            stream.quicSettings.security = getQueryValue("security", "none");
-            stream.quicSettings.key = getQueryValue("key", "");
-            stream.quicSettings.header.type = getQueryValue("type", "none");
-        }
-        else if (net == "grpc")
-        {
-            stream.grpcSettings.serviceName = getQueryValue("serviceName", "");
-        }
-        else
-        {
-            *errMessage = QObject::tr("Unknown transport method: ") + net;
-            return default;
-        }
-    }
-#undef default
-    if (tls)
-    {
-        stream.tlsSettings.allowInsecure = !FalseTypes.contains(getQueryValue("allowInsecure", "false"));
-        stream.tlsSettings.serverName = getQueryValue("tlsServerName", "");
-    }
-    QJsonObject root;
-    QJsonObject vConf;
-    QJsonArray vnextArray;
-    vnextArray.append(server.toJson());
-    vConf["vnext"] = vnextArray;
-    auto outbound = outbounds::GenerateOutboundEntry(OUTBOUND_TAG_PROXY, "vmess", vConf, stream.toJson());
-    QJsonObject inbound = inbounds::GenerateInboundEntry();
-
-    //
-    root["outbounds"] = QJsonArray{ outbound };
-    root["inbound"] = QJsonArray{ inbound };
-    return root;
-}
-
-} // namespace amnezia::serialization::vmess_new

client/platforms/ios/NELogController.swift

@@ -2,15 +2,15 @@ import Foundation
 import os.log
 
 public func wg_log(_ type: OSLogType, title: String = "", staticMessage: StaticString) {
-    neLog(type, title: "WG: \(title)", message: "\(staticMessage)")
+  neLog(type, title: "WG: \(title)", message: "\(staticMessage)")
 }
 
 public func wg_log(_ type: OSLogType, title: String = "", message: String) {
-    neLog(type, title: "WG: \(title)", message: message)
+  neLog(type, title: "WG: \(title)", message: message)
 }
 
 public func ovpnLog(_ type: OSLogType, title: String = "", message: String) {
-    neLog(type, title: "OVPN: \(title)", message: message)
+  neLog(type, title: "OVPN: \(title)", message: message)
 }
 
 public func neLog(_ type: OSLogType, title: String = "", message: String) {

client/platforms/ios/PacketTunnelProvider+OpenVPN.swift

@@ -3,232 +3,223 @@ import NetworkExtension
 import OpenVPNAdapter
 
 struct OpenVPNConfig: Decodable {
-    let config: String
-    let splitTunnelType: Int
-    let splitTunnelSites: [String]
+  let config: String
+  let splitTunnelType: Int
+  let splitTunnelSites: [String]
 
-    var str: String {
-        "splitTunnelType: \(splitTunnelType) splitTunnelSites: \(splitTunnelSites) config: \(config)"
-    }
+  var str: String {
+    "splitTunnelType: \(splitTunnelType) splitTunnelSites: \(splitTunnelSites) config: \(config)"
+  }
 }
 
 extension PacketTunnelProvider {
-    func startOpenVPN(completionHandler: @escaping (Error?) -> Void) {
-        guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
-              let providerConfiguration = protocolConfiguration.providerConfiguration,
-              let openVPNConfigData = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
-            ovpnLog(.error, message: "Can't start")
-            return
-        }
-
-        do {
-            let openVPNConfig = try JSONDecoder().decode(OpenVPNConfig.self, from: openVPNConfigData)
-            ovpnLog(.info, title: "config: ", message: openVPNConfig.str)
-            let ovpnConfiguration = Data(openVPNConfig.config.utf8)
-            setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
-        } catch {
-            ovpnLog(.error, message: "Can't parse config: \(error.localizedDescription)")
-
-            if let underlyingError = (error as NSError).userInfo[NSUnderlyingErrorKey] as? NSError {
-                ovpnLog(.error, message: "Can't parse config: \(underlyingError.localizedDescription)")
-            }
-
-            return
-        }
+  func startOpenVPN(completionHandler: @escaping (Error?) -> Void) {
+    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
+          let providerConfiguration = protocolConfiguration.providerConfiguration,
+          let openVPNConfigData = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
+      ovpnLog(.error, message: "Can't start")
+      return
     }
 
-    private func setupAndlaunchOpenVPN(withConfig ovpnConfiguration: Data,
-                                       withShadowSocks viaSS: Bool = false,
-                                       completionHandler: @escaping (Error?) -> Void) {
-        ovpnLog(.info, message: "Setup and launch")
+    do {
+      //      ovpnLog(.info, message: "providerConfiguration: \(String(decoding: openVPNConfigData, as: UTF8.self))")
 
-        let str = String(decoding: ovpnConfiguration, as: UTF8.self)
+      let openVPNConfig = try JSONDecoder().decode(OpenVPNConfig.self, from: openVPNConfigData)
+      ovpnLog(.info, title: "config: ", message: openVPNConfig.str)
+      let ovpnConfiguration = Data(openVPNConfig.config.utf8)
+      setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
+    } catch {
+      ovpnLog(.error, message: "Can't parse config: \(error.localizedDescription)")
 
-        let configuration = OpenVPNConfiguration()
-        configuration.fileContent = ovpnConfiguration
-        if str.contains("cloak") {
-            configuration.setPTCloak()
-        }
+      if let underlyingError = (error as NSError).userInfo[NSUnderlyingErrorKey] as? NSError {
+        ovpnLog(.error, message: "Can't parse config: \(underlyingError.localizedDescription)")
+      }
 
-        let evaluation: OpenVPNConfigurationEvaluation?
-        do {
-            ovpnAdapter = OpenVPNAdapter()
-            ovpnAdapter?.delegate = self
-            evaluation = try ovpnAdapter?.apply(configuration: configuration)
-
-        } catch {
-            completionHandler(error)
-            return
-        }
-
-        if evaluation?.autologin == false {
-            ovpnLog(.info, message: "Implement login with user credentials")
-        }
-
-        vpnReachability.startTracking { [weak self] status in
-            guard status == .reachableViaWiFi else { return }
-            self?.ovpnAdapter?.reconnect(afterTimeInterval: 5)
-        }
-
-        startHandler = completionHandler
-        ovpnAdapter?.connect(using: packetFlow)
+      return
     }
-    
-    func handleOpenVPNStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-        guard let completionHandler = completionHandler else { return }
-        let bytesin = ovpnAdapter?.transportStatistics.bytesIn
-        let bytesout = ovpnAdapter?.transportStatistics.bytesOut
+  }
 
-        guard let bytesin, let bytesout else {
-            completionHandler(nil)
-            return
-        }
+  private func setupAndlaunchOpenVPN(withConfig ovpnConfiguration: Data,
+                                     withShadowSocks viaSS: Bool = false,
+                                     completionHandler: @escaping (Error?) -> Void) {
+    ovpnLog(.info, message: "Setup and launch")
 
-        let response: [String: Any] = [
-            "rx_bytes": bytesin,
-            "tx_bytes": bytesout
-        ]
+    let str = String(decoding: ovpnConfiguration, as: UTF8.self)
 
-        completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+    let configuration = OpenVPNConfiguration()
+    configuration.fileContent = ovpnConfiguration
+    if str.contains("cloak") {
+      configuration.setPTCloak()
     }
 
-    func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-        ovpnLog(.info, message: "Stopping tunnel: reason: \(reason.description)")
+    let evaluation: OpenVPNConfigurationEvaluation
+    do {
+      evaluation = try ovpnAdapter.apply(configuration: configuration)
 
-        stopHandler = completionHandler
-        if vpnReachability.isTracking {
-            vpnReachability.stopTracking()
-        }
-        ovpnAdapter?.disconnect()
+    } catch {
+      completionHandler(error)
+      return
     }
+
+    if !evaluation.autologin {
+      ovpnLog(.info, message: "Implement login with user credentials")
+    }
+
+    vpnReachability.startTracking { [weak self] status in
+      guard status == .reachableViaWiFi else { return }
+      self?.ovpnAdapter.reconnect(afterTimeInterval: 5)
+    }
+
+    startHandler = completionHandler
+    ovpnAdapter.connect(using: packetFlow)
+
+    //        let ifaces = Interface.allInterfaces()
+    //            .filter { $0.family == .ipv4 }
+    //            .map { iface in iface.name }
+
+    //        ovpn_log(.error, message: "Available TUN Interfaces: \(ifaces)")
+  }
+
+  func handleOpenVPNStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    guard let completionHandler = completionHandler else { return }
+    let bytesin = ovpnAdapter.transportStatistics.bytesIn
+    let bytesout = ovpnAdapter.transportStatistics.bytesOut
+
+    let response: [String: Any] = [
+      "rx_bytes": bytesin,
+      "tx_bytes": bytesout
+    ]
+
+    completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+  }
+
+  func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+    ovpnLog(.info, message: "Stopping tunnel: reason: \(reason.description)")
+
+    stopHandler = completionHandler
+    if vpnReachability.isTracking {
+      vpnReachability.stopTracking()
+    }
+    ovpnAdapter.disconnect()
+  }
 }
 
 extension PacketTunnelProvider: OpenVPNAdapterDelegate {
-    // OpenVPNAdapter calls this delegate method to configure a VPN tunnel.
-    // `completionHandler` callback requires an object conforming to `OpenVPNAdapterPacketFlow`
-    // protocol if the tunnel is configured without errors. Otherwise send nil.
-    // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so
-    // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and
-    // send `self.packetFlow` to `completionHandler` callback.
-    func openVPNAdapter(
-        _ openVPNAdapter: OpenVPNAdapter,
-        configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?,
-        completionHandler: @escaping (Error?) -> Void
-    ) {
-        // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers
-        // send empty string to NEDNSSettings.matchDomains
-        networkSettings?.dnsSettings?.matchDomains = [""]
+  // OpenVPNAdapter calls this delegate method to configure a VPN tunnel.
+  // `completionHandler` callback requires an object conforming to `OpenVPNAdapterPacketFlow`
+  // protocol if the tunnel is configured without errors. Otherwise send nil.
+  // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so
+  // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and
+  // send `self.packetFlow` to `completionHandler` callback.
+  func openVPNAdapter(
+    _ openVPNAdapter: OpenVPNAdapter,
+    configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?,
+    completionHandler: @escaping (Error?) -> Void
+  ) {
+    // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers
+    // send empty string to NEDNSSettings.matchDomains
+    networkSettings?.dnsSettings?.matchDomains = [""]
 
-        if splitTunnelType == 1 {
-            var ipv4IncludedRoutes = [NEIPv4Route]()
+    if splitTunnelType == 1 {
+      var ipv4IncludedRoutes = [NEIPv4Route]()
 
-            guard let splitTunnelSites else {
-                completionHandler(NSError(domain: "Split tunnel sited not setted up", code: 0))
-                return
-            }
+      for allowedIPString in splitTunnelSites {
+        if let allowedIP = IPAddressRange(from: allowedIPString) {
+          ipv4IncludedRoutes.append(NEIPv4Route(
+            destinationAddress: "\(allowedIP.address)",
+            subnetMask: "\(allowedIP.subnetMask())"))
+        }
+      }
 
-            for allowedIPString in splitTunnelSites {
-                if let allowedIP = IPAddressRange(from: allowedIPString) {
-                    ipv4IncludedRoutes.append(NEIPv4Route(
-                        destinationAddress: "\(allowedIP.address)",
-                        subnetMask: "\(allowedIP.subnetMask())"))
-                }
-            }
+      networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
+    } else {
+      if splitTunnelType == 2 {
+        var ipv4ExcludedRoutes = [NEIPv4Route]()
+        var ipv4IncludedRoutes = [NEIPv4Route]()
+        var ipv6IncludedRoutes = [NEIPv6Route]()
 
-            networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
-        } else {
-            if splitTunnelType == 2 {
-                var ipv4ExcludedRoutes = [NEIPv4Route]()
-                var ipv4IncludedRoutes = [NEIPv4Route]()
-                var ipv6IncludedRoutes = [NEIPv6Route]()
-
-                guard let splitTunnelSites else {
-                    completionHandler(NSError(domain: "Split tunnel sited not setted up", code: 0))
-                    return
-                }
-
-                for excludeIPString in splitTunnelSites {
-                    if let excludeIP = IPAddressRange(from: excludeIPString) {
-                        ipv4ExcludedRoutes.append(NEIPv4Route(
-                            destinationAddress: "\(excludeIP.address)",
-                            subnetMask: "\(excludeIP.subnetMask())"))
-                    }
-                }
-
-                if let allIPv4 = IPAddressRange(from: "0.0.0.0/0") {
-                    ipv4IncludedRoutes.append(NEIPv4Route(
-                        destinationAddress: "\(allIPv4.address)",
-                        subnetMask: "\(allIPv4.subnetMask())"))
-                }
-                if let allIPv6 = IPAddressRange(from: "::/0") {
-                    ipv6IncludedRoutes.append(NEIPv6Route(
-                        destinationAddress: "\(allIPv6.address)",
-                        networkPrefixLength: NSNumber(value: allIPv6.networkPrefixLength)))
-                }
-                networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
-                networkSettings?.ipv6Settings?.includedRoutes = ipv6IncludedRoutes
-                networkSettings?.ipv4Settings?.excludedRoutes = ipv4ExcludedRoutes
-            }
+        for excludeIPString in splitTunnelSites {
+          if let excludeIP = IPAddressRange(from: excludeIPString) {
+            ipv4ExcludedRoutes.append(NEIPv4Route(
+              destinationAddress: "\(excludeIP.address)",
+              subnetMask: "\(excludeIP.subnetMask())"))
+          }
         }
 
-        // Set the network settings for the current tunneling session.
-        setTunnelNetworkSettings(networkSettings, completionHandler: completionHandler)
+        if let allIPv4 = IPAddressRange(from: "0.0.0.0/0") {
+          ipv4IncludedRoutes.append(NEIPv4Route(
+            destinationAddress: "\(allIPv4.address)",
+            subnetMask: "\(allIPv4.subnetMask())"))
+        }
+        if let allIPv6 = IPAddressRange(from: "::/0") {
+          ipv6IncludedRoutes.append(NEIPv6Route(
+            destinationAddress: "\(allIPv6.address)",
+            networkPrefixLength: NSNumber(value: allIPv6.networkPrefixLength)))
+        }
+        networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
+        networkSettings?.ipv6Settings?.includedRoutes = ipv6IncludedRoutes
+        networkSettings?.ipv4Settings?.excludedRoutes = ipv4ExcludedRoutes
+      }
     }
 
-    // Process events returned by the OpenVPN library
-    func openVPNAdapter(
-        _ openVPNAdapter: OpenVPNAdapter,
-        handleEvent event: OpenVPNAdapterEvent,
-        message: String?) {
-            switch event {
-            case .connected:
-                if reasserting {
-                    reasserting = false
-                }
+    // Set the network settings for the current tunneling session.
+    setTunnelNetworkSettings(networkSettings, completionHandler: completionHandler)
+  }
 
-                guard let startHandler = startHandler else { return }
-
-                startHandler(nil)
-                self.startHandler = nil
-            case .disconnected:
-                guard let stopHandler = stopHandler else { return }
-
-                if vpnReachability.isTracking {
-                    vpnReachability.stopTracking()
-                }
-
-                stopHandler()
-                self.stopHandler = nil
-            case .reconnecting:
-                reasserting = true
-            default:
-                break
-            }
+  // Process events returned by the OpenVPN library
+  func openVPNAdapter(
+    _ openVPNAdapter: OpenVPNAdapter,
+    handleEvent event: OpenVPNAdapterEvent,
+    message: String?) {
+      switch event {
+      case .connected:
+        if reasserting {
+          reasserting = false
         }
 
-    // Handle errors thrown by the OpenVPN library
-    func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) {
-        // Handle only fatal errors
-        guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool,
-              fatal == true else { return }
+        guard let startHandler = startHandler else { return }
+
+        startHandler(nil)
+        self.startHandler = nil
+      case .disconnected:
+        guard let stopHandler = stopHandler else { return }
 
         if vpnReachability.isTracking {
-            vpnReachability.stopTracking()
+          vpnReachability.stopTracking()
         }
 
-        if let startHandler {
-            startHandler(error)
-            self.startHandler = nil
-        } else {
-            cancelTunnelWithError(error)
-        }
+        stopHandler()
+        self.stopHandler = nil
+      case .reconnecting:
+        reasserting = true
+      default:
+        break
+      }
     }
 
-    // Use this method to process any log message returned by OpenVPN library.
-    func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleLogMessage logMessage: String) {
-        // Handle log messages
-        ovpnLog(.info, message: logMessage)
+  // Handle errors thrown by the OpenVPN library
+  func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) {
+    // Handle only fatal errors
+    guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool,
+          fatal == true else { return }
+
+    if vpnReachability.isTracking {
+      vpnReachability.stopTracking()
     }
+
+    if let startHandler {
+      startHandler(error)
+      self.startHandler = nil
+    } else {
+      cancelTunnelWithError(error)
+    }
+  }
+
+  // Use this method to process any log message returned by OpenVPN library.
+  func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleLogMessage logMessage: String) {
+    // Handle log messages
+    ovpnLog(.info, message: logMessage)
+  }
 }
 
 extension NEPacketTunnelFlow: OpenVPNAdapterPacketFlow {}

client/platforms/ios/PacketTunnelProvider+WireGuard.swift

@@ -2,186 +2,220 @@ import Foundation
 import NetworkExtension
 
 extension PacketTunnelProvider {
-    func startWireguard(activationAttemptId: String?,
-                        errorNotifier: ErrorNotifier,
-                        completionHandler: @escaping (Error?) -> Void) {
-        guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
-              let providerConfiguration = protocolConfiguration.providerConfiguration,
-              let wgConfigData: Data = providerConfiguration[Constants.wireGuardConfigKey] as? Data else {
-            wg_log(.error, message: "Can't start, config missing")
-            completionHandler(nil)
-            return
-        }
-
-        do {
-            let wgConfig = try JSONDecoder().decode(WGConfig.self, from: wgConfigData)
-            let wgConfigStr = wgConfig.str
-            wg_log(.info, title: "config: ", message: wgConfig.redux)
-
-            let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: wgConfigStr)
-
-            if tunnelConfiguration.peers.first!.allowedIPs
-                .map({ $0.stringRepresentation })
-                .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
-                if wgConfig.splitTunnelType == 1 {
-                    for index in tunnelConfiguration.peers.indices {
-                        tunnelConfiguration.peers[index].allowedIPs.removeAll()
-                        var allowedIPs = [IPAddressRange]()
-
-                        for allowedIPString in wgConfig.splitTunnelSites {
-                            if let allowedIP = IPAddressRange(from: allowedIPString) {
-                                allowedIPs.append(allowedIP)
-                            }
-                        }
-
-                        tunnelConfiguration.peers[index].allowedIPs = allowedIPs
-                    }
-                } else if wgConfig.splitTunnelType == 2 {
-                    for index in tunnelConfiguration.peers.indices {
-                        var excludeIPs = [IPAddressRange]()
-
-                        for excludeIPString in wgConfig.splitTunnelSites {
-                            if let excludeIP = IPAddressRange(from: excludeIPString) {
-                                excludeIPs.append(excludeIP)
-                            }
-                        }
-
-                        tunnelConfiguration.peers[index].excludeIPs = excludeIPs
-                    }
-                }
-            }
-
-            wg_log(.info, message: "Starting tunnel from the " +
-                   (activationAttemptId == nil ? "OS directly, rather than the app" : "app"))
-
-            // Start the tunnel
-            wgAdapter = WireGuardAdapter(with: self) { logLevel, message in
-                wg_log(logLevel.osLogLevel, message: message)
-            }
-
-            wgAdapter?.start(tunnelConfiguration: tunnelConfiguration) { [weak self] adapterError in
-                guard let adapterError else {
-                    let interfaceName = self?.wgAdapter?.interfaceName ?? "unknown"
-                    wg_log(.info, message: "Tunnel interface is \(interfaceName)")
-                    completionHandler(nil)
-                    return
-                }
-
-                switch adapterError {
-                case .cannotLocateTunnelFileDescriptor:
-                    wg_log(.error, staticMessage: "Starting tunnel failed: could not determine file descriptor")
-                    errorNotifier.notify(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
-                    completionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
-                case .dnsResolution(let dnsErrors):
-                    let hostnamesWithDnsResolutionFailure = dnsErrors.map { $0.address }
-                        .joined(separator: ", ")
-                    wg_log(.error, message:
-                            "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure)")
-                    errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure)
-                    completionHandler(PacketTunnelProviderError.dnsResolutionFailure)
-                case .setNetworkSettings(let error):
-                    wg_log(.error, message:
-                            "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
-                    errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
-                    completionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
-                case .startWireGuardBackend(let errorCode):
-                    wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(errorCode)")
-                    errorNotifier.notify(PacketTunnelProviderError.couldNotStartBackend)
-                    completionHandler(PacketTunnelProviderError.couldNotStartBackend)
-                case .invalidState:
-                    fatalError()
-                }
-            }
-        } catch {
-            wg_log(.error, message: "Can't parse WG config: \(error.localizedDescription)")
+  func startWireguard(activationAttemptId: String?,
+                      errorNotifier: ErrorNotifier,
+                      completionHandler: @escaping (Error?) -> Void) {
+    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
+          let providerConfiguration = protocolConfiguration.providerConfiguration,
+          let wgConfigData: Data = providerConfiguration[Constants.wireGuardConfigKey] as? Data else {
+      wg_log(.error, message: "Can't start, config missing")
+      completionHandler(nil)
+      return
+    }
+
+    do {
+      let wgConfig = try JSONDecoder().decode(WGConfig.self, from: wgConfigData)
+      let wgConfigStr = wgConfig.str
+      wg_log(.info, title: "config: ", message: wgConfig.redux)
+
+      let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: wgConfigStr)
+
+      if tunnelConfiguration.peers.first!.allowedIPs
+        .map({ $0.stringRepresentation })
+        .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
+        if wgConfig.splitTunnelType == 1 {
+          for index in tunnelConfiguration.peers.indices {
+            tunnelConfiguration.peers[index].allowedIPs.removeAll()
+            var allowedIPs = [IPAddressRange]()
+
+            for allowedIPString in wgConfig.splitTunnelSites {
+              if let allowedIP = IPAddressRange(from: allowedIPString) {
+                allowedIPs.append(allowedIP)
+              }
+            }
+
+            tunnelConfiguration.peers[index].allowedIPs = allowedIPs
+          }
+        } else if wgConfig.splitTunnelType == 2 {
+          for index in tunnelConfiguration.peers.indices {
+            var excludeIPs = [IPAddressRange]()
+
+            for excludeIPString in wgConfig.splitTunnelSites {
+              if let excludeIP = IPAddressRange(from: excludeIPString) {
+                excludeIPs.append(excludeIP)
+              }
+            }
+
+            tunnelConfiguration.peers[index].excludeIPs = excludeIPs
+          }
+        }
+      }
+
+      wg_log(.info, message: "Starting tunnel from the " +
+             (activationAttemptId == nil ? "OS directly, rather than the app" : "app"))
+
+      // Start the tunnel
+      wgAdapter.start(tunnelConfiguration: tunnelConfiguration) { adapterError in
+        guard let adapterError else {
+          let interfaceName = self.wgAdapter.interfaceName ?? "unknown"
+          wg_log(.info, message: "Tunnel interface is \(interfaceName)")
+          completionHandler(nil)
+          return
+        }
+
+        switch adapterError {
+        case .cannotLocateTunnelFileDescriptor:
+          wg_log(.error, staticMessage: "Starting tunnel failed: could not determine file descriptor")
+          errorNotifier.notify(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
+          completionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
+        case .dnsResolution(let dnsErrors):
+          let hostnamesWithDnsResolutionFailure = dnsErrors.map { $0.address }
+            .joined(separator: ", ")
+          wg_log(.error, message:
+                  "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure)")
+          errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure)
+          completionHandler(PacketTunnelProviderError.dnsResolutionFailure)
+        case .setNetworkSettings(let error):
+          wg_log(.error, message:
+                  "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
+          errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
+          completionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
+        case .startWireGuardBackend(let errorCode):
+          wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(errorCode)")
+          errorNotifier.notify(PacketTunnelProviderError.couldNotStartBackend)
+          completionHandler(PacketTunnelProviderError.couldNotStartBackend)
+        case .invalidState:
+          fatalError()
+        }
+      }
+    } catch {
+      wg_log(.error, message: "Can't parse WG config: \(error.localizedDescription)")
+      completionHandler(nil)
+      return
+    }
+  }
+
+  func handleWireguardStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    guard let completionHandler = completionHandler else { return }
+    wgAdapter.getRuntimeConfiguration { settings in
+      var data: Data?
+      if let settings {
+        data = settings.data(using: .utf8)!
+      }
+
+      let components = settings!.components(separatedBy: "\n")
+
+      var settingsDictionary: [String: String] = [:]
+      for component in components {
+        let pair = component.components(separatedBy: "=")
+        if pair.count == 2 {
+          settingsDictionary[pair[0]] = pair[1]
+        }
+      }
+
+      let response: [String: Any] = [
+        "rx_bytes": settingsDictionary["rx_bytes"] ?? "0",
+        "tx_bytes": settingsDictionary["tx_bytes"] ?? "0"
+      ]
+
+      completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+    }
+  }
+
+  private func handleWireguardAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    guard let completionHandler = completionHandler else { return }
+    if messageData.count == 1 && messageData[0] == 0 {
+      wgAdapter.getRuntimeConfiguration { settings in
+        var data: Data?
+        if let settings {
+          data = settings.data(using: .utf8)!
+        }
+        completionHandler(data)
+      }
+    } else if messageData.count >= 1 {
+      // Updates the tunnel configuration and responds with the active configuration
+      wg_log(.info, message: "Switching tunnel configuration")
+      guard let configString = String(data: messageData, encoding: .utf8)
+      else {
+        completionHandler(nil)
+        return
+      }
+
+      do {
+        let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: configString)
+        wgAdapter.update(tunnelConfiguration: tunnelConfiguration) { error in
+          if let error {
+            wg_log(.error, message: "Failed to switch tunnel configuration: \(error.localizedDescription)")
             completionHandler(nil)
             return
+          }
+
+          self.wgAdapter.getRuntimeConfiguration { settings in
+            var data: Data?
+            if let settings {
+              data = settings.data(using: .utf8)!
+            }
+            completionHandler(data)
+          }
         }
+      } catch {
+        completionHandler(nil)
+      }
+    } else {
+      completionHandler(nil)
     }
+  }
 
-    func handleWireguardStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-        guard let completionHandler = completionHandler else { return }
-        wgAdapter?.getRuntimeConfiguration { settings in
-            let components = settings!.components(separatedBy: "\n")
+  //  private func startEmptyTunnel(completionHandler: @escaping (Error?) -> Void) {
+  //    dispatchPrecondition(condition: .onQueue(dispatchQueue))
+  //
+  //    let emptyTunnelConfiguration = TunnelConfiguration(
+  //      name: nil,
+  //      interface: InterfaceConfiguration(privateKey: PrivateKey()),
+  //      peers: []
+  //    )
+  //
+  //    wgAdapter.start(tunnelConfiguration: emptyTunnelConfiguration) { error in
+  //      self.dispatchQueue.async {
+  //        if let error {
+  //          wg_log(.error, message: "Failed to start an empty tunnel")
+  //          completionHandler(error)
+  //        } else {
+  //          wg_log(.info, message: "Started an empty tunnel")
+  //          self.tunnelAdapterDidStart()
+  //        }
+  //      }
+  //    }
+  //
+  //    let settings = NETunnelNetworkSettings(tunnelRemoteAddress: "1.1.1.1")
+  //
+  //    self.setTunnelNetworkSettings(settings) { error in
+  //      completionHandler(error)
+  //    }
+  //  }
 
-            var settingsDictionary: [String: String] = [:]
-            for component in components {
-                let pair = component.components(separatedBy: "=")
-                if pair.count == 2 {
-                    settingsDictionary[pair[0]] = pair[1]
-                }
-            }
+  //  private func tunnelAdapterDidStart() {
+  //    dispatchPrecondition(condition: .onQueue(dispatchQueue))
+  //    // ...
+  //  }
 
-            let response: [String: Any] = [
-                "rx_bytes": settingsDictionary["rx_bytes"] ?? "0",
-                "tx_bytes": settingsDictionary["tx_bytes"] ?? "0"
-            ]
+  func stopWireguard(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+    wg_log(.info, message: "Stopping tunnel: reason: \(reason.description)")
 
-            completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
-        }
-    }
+    wgAdapter.stop { error in
+      ErrorNotifier.removeLastErrorFile()
 
-    private func handleWireguardAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-        guard let completionHandler = completionHandler else { return }
-        if messageData.count == 1 && messageData[0] == 0 {
-            wgAdapter?.getRuntimeConfiguration { settings in
-                var data: Data?
-                if let settings {
-                    data = settings.data(using: .utf8)!
-                }
-                completionHandler(data)
-            }
-        } else if messageData.count >= 1 {
-            // Updates the tunnel configuration and responds with the active configuration
-            wg_log(.info, message: "Switching tunnel configuration")
-            guard let configString = String(data: messageData, encoding: .utf8)
-            else {
-                completionHandler(nil)
-                return
-            }
-
-            do {
-                let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: configString)
-                wgAdapter?.update(tunnelConfiguration: tunnelConfiguration) { [weak self] error in
-                    if let error {
-                        wg_log(.error, message: "Failed to switch tunnel configuration: \(error.localizedDescription)")
-                        completionHandler(nil)
-                        return
-                    }
-
-                    self?.wgAdapter?.getRuntimeConfiguration { settings in
-                        var data: Data?
-                        if let settings {
-                            data = settings.data(using: .utf8)!
-                        }
-                        completionHandler(data)
-                    }
-                }
-            } catch {
-                completionHandler(nil)
-            }
-        } else {
-            completionHandler(nil)
-        }
-    }
-
-    func stopWireguard(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-        wg_log(.info, message: "Stopping tunnel: reason: \(reason.description)")
-
-        wgAdapter?.stop { error in
-            ErrorNotifier.removeLastErrorFile()
-
-            if let error {
-                wg_log(.error, message: "Failed to stop WireGuard adapter: \(error.localizedDescription)")
-            }
-            completionHandler()
+      if let error {
+        wg_log(.error, message: "Failed to stop WireGuard adapter: \(error.localizedDescription)")
+      }
+      completionHandler()
 
 #if os(macOS)
-            // HACK: This is a filthy hack to work around Apple bug 32073323 (dup'd by us as 47526107).
-            // Remove it when they finally fix this upstream and the fix has been rolled out to
-            // sufficient quantities of users.
-            exit(0)
+      // HACK: This is a filthy hack to work around Apple bug 32073323 (dup'd by us as 47526107).
+      // Remove it when they finally fix this upstream and the fix has been rolled out to
+      // sufficient quantities of users.
+      exit(0)
 #endif
-        }
     }
+  }
 }

client/platforms/ios/PacketTunnelProvider.swift

@@ -5,7 +5,7 @@ import Darwin
 import OpenVPNAdapter
 
 enum TunnelProtoType: String {
-  case wireguard, openvpn
+  case wireguard, openvpn, shadowsocks, none
 }
 
 struct Constants {
@@ -34,138 +34,160 @@ struct Constants {
 }
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
-    var wgAdapter: WireGuardAdapter?
-    var ovpnAdapter: OpenVPNAdapter?
-
-    var splitTunnelType: Int?
-    var splitTunnelSites: [String]?
-
-    let vpnReachability = OpenVPNReachability()
-
-    var startHandler: ((Error?) -> Void)?
-    var stopHandler: (() -> Void)?
-    var protoType: TunnelProtoType?
-
+  lazy var wgAdapter = {
+    WireGuardAdapter(with: self) { logLevel, message in
+      wg_log(logLevel.osLogLevel, message: message)
+    }
+  }()
+  
+  lazy var ovpnAdapter: OpenVPNAdapter = {
+    let adapter = OpenVPNAdapter()
+    adapter.delegate = self
+    return adapter
+  }()
+  
+  /// Internal queue.
+  private let dispatchQueue = DispatchQueue(label: "PacketTunnel", qos: .utility)
+  
+  var splitTunnelType: Int!
+  var splitTunnelSites: [String]!
+  
+  let vpnReachability = OpenVPNReachability()
+  
+  var startHandler: ((Error?) -> Void)?
+  var stopHandler: (() -> Void)?
+  var protoType: TunnelProtoType = .none
+  
   override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-      guard let message = String(data: messageData, encoding: .utf8) else {
-          if let completionHandler {
-              completionHandler(nil)
-          }
-          return
-      }
-
-      neLog(.info, title: "App said: ", message: message)
-
-      guard let message = try? JSONSerialization.jsonObject(with: messageData, options: []) as? [String: Any] else {
-          neLog(.error, message: "Failed to serialize message from app")
-          return
-      }
-
-      guard let completionHandler else {
-          neLog(.error, message: "Missing message completion handler")
-          return
-      }
-
-      guard let action = message[Constants.kMessageKeyAction] as? String else {
-          neLog(.error, message: "Missing action key in app message")
-          completionHandler(nil)
-          return
-      }
-
-      if action == Constants.kActionStatus {
-          handleStatusAppMessage(messageData,
-                                 completionHandler: completionHandler)
+    guard let message = String(data: messageData, encoding: .utf8) else {
+      if let completionHandler {
+        completionHandler(nil)
       }
+      return
+    }
+    
+    neLog(.info, title: "App said: ", message: message)
+    
+    guard let message = try? JSONSerialization.jsonObject(with: messageData, options: []) as? [String: Any] else {
+      neLog(.error, message: "Failed to serialize message from app")
+      return
+    }
+    
+    guard let completionHandler else {
+      neLog(.error, message: "Missing message completion handler")
+      return
+    }
+    
+    guard let action = message[Constants.kMessageKeyAction] as? String else {
+      neLog(.error, message: "Missing action key in app message")
+      completionHandler(nil)
+      return
+    }
+    
+    if action == Constants.kActionStatus {
+      handleStatusAppMessage(messageData, completionHandler: completionHandler)
+    }
   }
-
-    override func startTunnel(options: [String : NSObject]? = nil,
-                              completionHandler: @escaping ((any Error)?) -> Void) {
-        let activationAttemptId = options?[Constants.kActivationAttemptId] as? String
-        let errorNotifier = ErrorNotifier(activationAttemptId: activationAttemptId)
-
-        neLog(.info, message: "Start tunnel")
-
-        if let protocolConfiguration = protocolConfiguration as? NETunnelProviderProtocol {
-            let providerConfiguration = protocolConfiguration.providerConfiguration
-            if (providerConfiguration?[Constants.ovpnConfigKey] as? Data) != nil {
-                protoType = .openvpn
-            } else if (providerConfiguration?[Constants.wireGuardConfigKey] as? Data) != nil {
-                protoType = .wireguard
-            }
-        }
-
-        guard let protoType else {
-            let error = NSError(domain: "Protocol is not selected", code: 0)
-            completionHandler(error)
-            return
-        }
-
-        switch protoType {
-        case .wireguard:
-            startWireguard(activationAttemptId: activationAttemptId,
-                           errorNotifier: errorNotifier,
-                           completionHandler: completionHandler)
-        case .openvpn:
-            startOpenVPN(completionHandler: completionHandler)
-        }
-    }
-
   
-    override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-        guard let protoType else {
-            completionHandler()
-            return
-        }
-
-        switch protoType {
-        case .wireguard:
-            stopWireguard(with: reason,
-                          completionHandler: completionHandler)
-        case .openvpn:
-            stopOpenVPN(with: reason,
-                        completionHandler: completionHandler)
+  override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
+    dispatchQueue.async {
+      let activationAttemptId = options?[Constants.kActivationAttemptId] as? String
+      let errorNotifier = ErrorNotifier(activationAttemptId: activationAttemptId)
+      
+      neLog(.info, message: "Start tunnel")
+      
+      if let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol {
+        let providerConfiguration = protocolConfiguration.providerConfiguration
+        if (providerConfiguration?[Constants.ovpnConfigKey] as? Data) != nil {
+          self.protoType = .openvpn
+        } else if (providerConfiguration?[Constants.wireGuardConfigKey] as? Data) != nil {
+          self.protoType = .wireguard
         }
+      } else {
+        self.protoType = .none
+      }
+      
+      switch self.protoType {
+      case .wireguard:
+        self.startWireguard(activationAttemptId: activationAttemptId,
+                            errorNotifier: errorNotifier,
+                            completionHandler: completionHandler)
+      case .openvpn:
+        self.startOpenVPN(completionHandler: completionHandler)
+      case .shadowsocks:
+        break
+        //  startShadowSocks(completionHandler: completionHandler)
+      case .none:
+        break
+      }
     }
+  }
   
-    func handleStatusAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-        guard let protoType else {
-            completionHandler?(nil)
-            return
-        }
-
-        switch protoType {
-        case .wireguard:
-            handleWireguardStatusMessage(messageData, completionHandler: completionHandler)
-        case .openvpn:
-            handleOpenVPNStatusMessage(messageData, completionHandler: completionHandler)
-        }
+  override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+    dispatchQueue.async {
+      switch self.protoType {
+      case .wireguard:
+        self.stopWireguard(with: reason, completionHandler: completionHandler)
+      case .openvpn:
+        self.stopOpenVPN(with: reason, completionHandler: completionHandler)
+      case .shadowsocks:
+        break
+        //  stopShadowSocks(with: reason, completionHandler: completionHandler)
+      case .none:
+        break
+      }
     }
+  }
   
-    // MARK: Network observing methods
-    override func observeValue(forKeyPath keyPath: String?,
-                               of object: Any?,
-                               change: [NSKeyValueChangeKey: Any]?,
-                               context: UnsafeMutableRawPointer?) {
-        guard Constants.kDefaultPathKey != keyPath else { return }
-        // Since iOS 11, we have observed that this KVO event fires repeatedly when connecting over Wifi,
-        // even though the underlying network has not changed (i.e. `isEqualToPath` returns false),
-        // leading to "wakeup crashes" due to excessive network activity. Guard against false positives by
-        // comparing the paths' string description, which includes properties not exposed by the class
-        guard let lastPath: NWPath = change?[.oldKey] as? NWPath,
-              let defPath = defaultPath,
-              lastPath != defPath || lastPath.description != defPath.description else {
-            return
-        }
-        DispatchQueue.main.async { [weak self] in
-            guard let self, self.defaultPath != nil else { return }
-            self.handle(networkChange: self.defaultPath!) { _ in }
-        }
+  func handleStatusAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    switch protoType {
+    case .wireguard:
+      handleWireguardStatusMessage(messageData, completionHandler: completionHandler)
+    case .openvpn:
+      handleOpenVPNStatusMessage(messageData, completionHandler: completionHandler)
+    case .shadowsocks:
+      break
+      //            handleShadowSocksAppMessage(messageData, completionHandler: completionHandler)
+    case .none:
+      break
     }
+  }
   
-    private func handle(networkChange changePath: NWPath, completion: @escaping (Error?) -> Void) {
-        wg_log(.info, message: "Tunnel restarted.")
-        startTunnel(options: nil, completionHandler: completion)
+  // MARK: Network observing methods
+  
+  private func startListeningForNetworkChanges() {
+    stopListeningForNetworkChanges()
+    addObserver(self, forKeyPath: Constants.kDefaultPathKey, options: .old, context: nil)
+  }
+  
+  private func stopListeningForNetworkChanges() {
+    removeObserver(self, forKeyPath: Constants.kDefaultPathKey)
+  }
+  
+  override func observeValue(forKeyPath keyPath: String?,
+                             of object: Any?,
+                             change: [NSKeyValueChangeKey: Any]?,
+                             context: UnsafeMutableRawPointer?) {
+    guard Constants.kDefaultPathKey != keyPath else { return }
+    // Since iOS 11, we have observed that this KVO event fires repeatedly when connecting over Wifi,
+    // even though the underlying network has not changed (i.e. `isEqualToPath` returns false),
+    // leading to "wakeup crashes" due to excessive network activity. Guard against false positives by
+    // comparing the paths' string description, which includes properties not exposed by the class
+    guard let lastPath: NWPath = change?[.oldKey] as? NWPath,
+          let defPath = defaultPath,
+          lastPath != defPath || lastPath.description != defPath.description else {
+      return
     }
+    DispatchQueue.main.async { [weak self] in
+      guard let self, self.defaultPath != nil else { return }
+      self.handle(networkChange: self.defaultPath!) { _ in }
+    }
+  }
+  
+  private func handle(networkChange changePath: NWPath, completion: @escaping (Error?) -> Void) {
+    wg_log(.info, message: "Tunnel restarted.")
+    startTunnel(options: nil, completionHandler: completion)
+  }
 }
 
 extension WireGuardLogLevel {

client/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -18,7 +18,7 @@
 #include "logger.h"
 
 constexpr const int WG_TUN_PROC_TIMEOUT = 5000;
-constexpr const char* WG_RUNTIME_DIR = "/var/run/amneziawg";
+constexpr const char* WG_RUNTIME_DIR = "/var/run/wireguard";
 
 namespace {
 Logger logger("WireguardUtilsLinux");

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -16,7 +16,7 @@
 #include "logger.h"
 
 constexpr const int WG_TUN_PROC_TIMEOUT = 5000;
-constexpr const char* WG_RUNTIME_DIR = "/var/run/amneziawg";
+constexpr const char* WG_RUNTIME_DIR = "/var/run/wireguard";
 
 namespace {
 Logger logger("WireguardUtilsMacos");

client/platforms/windows/daemon/windowsdaemon.h

@@ -11,7 +11,7 @@
 #include "windowstunnelservice.h"
 #include "wireguardutilswindows.h"
 
-#define TUNNEL_SERVICE_NAME L"AmneziaWGTunnel$AmneziaVPN"
+#define TUNNEL_SERVICE_NAME L"WireGuardTunnel$AmneziaVPN"
 
 class WindowsDaemon final : public Daemon {
   Q_DISABLE_COPY_MOVE(WindowsDaemon)

client/platforms/windows/daemon/windowstunnelservice.cpp

@@ -17,7 +17,7 @@
 
 #define TUNNEL_NAMED_PIPE \
   "\\\\."                 \
-  "\\pipe\\ProtectedPrefix\\Administrators\\AmneziaWG\\AmneziaVPN"
+  "\\pipe\\ProtectedPrefix\\Administrators\\WireGuard\\AmneziaVPN"
 
 constexpr uint32_t WINDOWS_TUNNEL_MONITOR_TIMEOUT_MSEC = 2000;
 

client/protocols/protocols_defs.cpp

@@ -72,13 +72,10 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
              { Proto::Ikev2, "IKEv2" },
              { Proto::L2tp, "L2TP" },
              { Proto::Xray, "XRay" },
-             { Proto::SSXray, "ShadowSocks"},
-
 
              { Proto::TorWebSite, "Website in Tor network" },
              { Proto::Dns, "DNS Service" },
-             { Proto::Sftp, QObject::tr("SFTP service") },
-             { Proto::Socks5Proxy, QObject::tr("SOCKS5 proxy server") } };
+             { Proto::Sftp, QObject::tr("Sftp service") } };
 }
 
 QMap<amnezia::Proto, QString> ProtocolProps::protocolDescriptions()
@@ -90,8 +87,6 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
 {
     switch (p) {
     case Proto::Any: return ServiceType::None;
-    case Proto::SSXray: return ServiceType::None;
-
     case Proto::OpenVpn: return ServiceType::Vpn;
     case Proto::Cloak: return ServiceType::Vpn;
     case Proto::ShadowSocks: return ServiceType::Vpn;
@@ -103,7 +98,6 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p)
     case Proto::TorWebSite: return ServiceType::Other;
     case Proto::Dns: return ServiceType::Other;
     case Proto::Sftp: return ServiceType::Other;
-    case Proto::Socks5Proxy: return ServiceType::Other;
     default: return ServiceType::Other;
     }
 }
@@ -115,7 +109,6 @@ int ProtocolProps::getPortForInstall(Proto p)
     case WireGuard:
     case ShadowSocks:
     case OpenVpn:
-    case Socks5Proxy:
         return QRandomGenerator::global()->bounded(30000, 50000);
     default:
         return defaultPort(p);
@@ -138,7 +131,6 @@ int ProtocolProps::defaultPort(Proto p)
     case Proto::TorWebSite: return -1;
     case Proto::Dns: return 53;
     case Proto::Sftp: return 222;
-    case Proto::Socks5Proxy: return 38080;
     default: return -1;
     }
 }
@@ -158,7 +150,6 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::TorWebSite: return false;
     case Proto::Dns: return false;
     case Proto::Sftp: return true;
-    case Proto::Socks5Proxy: return true;
     default: return false;
     }
 }
@@ -169,7 +160,7 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p)
     case Proto::Any: return TransportProto::Udp;
     case Proto::OpenVpn: return TransportProto::Udp;
     case Proto::Cloak: return TransportProto::Tcp;
-    case Proto::ShadowSocks: return TransportProto::TcpAndUdp;
+    case Proto::ShadowSocks: return TransportProto::Tcp;
     case Proto::WireGuard: return TransportProto::Udp;
     case Proto::Awg: return TransportProto::Udp;
     case Proto::Ikev2: return TransportProto::Udp;
@@ -180,7 +171,6 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p)
     case Proto::TorWebSite: return TransportProto::Tcp;
     case Proto::Dns: return TransportProto::Udp;
     case Proto::Sftp: return TransportProto::Tcp;
-    case Proto::Socks5Proxy: return TransportProto::Tcp;
     }
 }
 
@@ -201,7 +191,6 @@ bool ProtocolProps::defaultTransportProtoChangeable(Proto p)
     case Proto::TorWebSite: return false;
     case Proto::Dns: return false;
     case Proto::Sftp: return false;
-    case Proto::Socks5Proxy: return false;
     default: return false;
     }
     return false;

client/protocols/protocols_defs.h

@@ -83,8 +83,6 @@ namespace amnezia
         constexpr char sftp[] = "sftp";
         constexpr char awg[] = "awg";
         constexpr char xray[] = "xray";
-        constexpr char ssxray[] = "ssxray";
-        constexpr char socks5proxy[] = "socks5proxy";
 
         constexpr char configVersion[] = "config_version";
 
@@ -175,12 +173,7 @@ namespace amnezia
             constexpr char defaultSubnetCidr[] = "24";
 
             constexpr char defaultPort[] = "51820";
-
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-            constexpr char defaultMtu[] = "1280";
-#else
-            constexpr char defaultMtu[] = "1376";
-#endif
+            constexpr char defaultMtu[] = "1420";
             constexpr char serverConfigPath[] = "/opt/amnezia/wireguard/wg0.conf";
             constexpr char serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key";
             constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key";
@@ -196,11 +189,7 @@ namespace amnezia
         namespace awg
         {
             constexpr char defaultPort[] = "55424";
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-            constexpr char defaultMtu[] = "1280";
-#else
-            constexpr char defaultMtu[] = "1376";
-#endif
+            constexpr char defaultMtu[] = "1420";
 
             constexpr char serverConfigPath[] = "/opt/amnezia/awg/wg0.conf";
             constexpr char serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key";
@@ -217,14 +206,6 @@ namespace amnezia
             constexpr char defaultUnderloadPacketMagicHeader[] = "1766607858";
         }
 
-        namespace socks5Proxy
-        {
-            constexpr char defaultUserName[] = "proxy_user";
-            constexpr char defaultPort[] = "38080";
-
-            constexpr char proxyConfigPath[] = "/usr/local/3proxy/conf/3proxy.cfg";
-        }
-
     } // namespace protocols
 
     namespace ProtocolEnumNS
@@ -233,8 +214,7 @@ namespace amnezia
 
         enum TransportProto {
             Udp,
-            Tcp,
-            TcpAndUdp
+            Tcp
         };
         Q_ENUM_NS(TransportProto)
 
@@ -248,13 +228,11 @@ namespace amnezia
             Ikev2,
             L2tp,
             Xray,
-            SSXray,
 
             // non-vpn
             TorWebSite,
             Dns,
-            Sftp,
-            Socks5Proxy
+            Sftp
         };
         Q_ENUM_NS(Proto)
 

client/protocols/vpnprotocol.cpp

@@ -116,7 +116,6 @@ VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject &
     case DockerContainer::WireGuard: return new WireguardProtocol(configuration);
     case DockerContainer::Awg: return new WireguardProtocol(configuration);
     case DockerContainer::Xray: return new XrayProtocol(configuration);
-    case DockerContainer::SSXray: return new XrayProtocol(configuration);
 #endif
     default: return nullptr;
     }

client/protocols/xrayprotocol.cpp

@@ -233,9 +233,6 @@ void XrayProtocol::readXrayConfiguration(const QJsonObject &configuration)
 {
     m_configData = configuration;
     QJsonObject xrayConfiguration = configuration.value(ProtocolProps::key_proto_config_data(Proto::Xray)).toObject();
-    if (xrayConfiguration.isEmpty()) {
-        xrayConfiguration = configuration.value(ProtocolProps::key_proto_config_data(Proto::SSXray)).toObject();
-    }
     m_xrayConfig = xrayConfiguration;
     m_localPort = QString(amnezia::protocols::xray::defaultLocalProxyPort).toInt();
     m_remoteAddress = configuration.value(amnezia::config_key::hostName).toString();

client/resources.qrc

@@ -198,7 +198,7 @@
         <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>        
         <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
         <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
         <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
@@ -239,10 +239,5 @@
         <file>images/controls/alert-circle.svg</file>
         <file>images/controls/file-check-2.svg</file>
         <file>ui/qml/Controls2/WarningType.qml</file>
-        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
-        <file>server_scripts/socks5_proxy/run_container.sh</file>
-        <file>server_scripts/socks5_proxy/Dockerfile</file>
-        <file>server_scripts/socks5_proxy/configure_container.sh</file>
-        <file>server_scripts/socks5_proxy/start.sh</file>
     </qresource>
 </RCC>

client/secure_qsettings.cpp

@@ -123,27 +123,8 @@ QByteArray SecureQSettings::backupAppConfig() const
 {
     QJsonObject cfg;
 
-    const auto needToBackup = [this](const auto &key) {
-      for (const auto &item : m_fieldsToBackup)
-      {
-        if (key == "Conf/installationUuid")
-        {
-          return false;
-        }
-
-        if (key.startsWith(item))
-        {
-            return true;
-        }
-      }
-
-      return false;
-    };
-
     for (const QString &key : m_settings.allKeys()) {
-
-        if (!needToBackup(key))
-        {
+        if (key == "Conf/installationUuid") {
             continue;
         }
 

client/secure_qsettings.h

@@ -47,10 +47,6 @@ private:
     mutable QMap<QString, QVariant> m_cache;
 
     QStringList encryptedKeys; // encode only key listed here
-    // only this fields need for backup
-    QStringList m_fieldsToBackup = {
-        "Conf/", "Servers/",
-    };
 
     mutable QByteArray m_key;
     mutable QByteArray m_iv;

client/server_scripts/openvpn_shadowsocks/configure_container.sh

@@ -40,7 +40,6 @@ cat > /opt/amnezia/shadowsocks/ss-config.json <<EOF
     "password": "$SHADOWSOCKS_PASSWORD",
     "server": "0.0.0.0",
     "server_port": $SHADOWSOCKS_SERVER_PORT,
-    "timeout": 60,
-    "mode" : "tcp_and_udp"
+    "timeout": 60
 }
 EOF

client/server_scripts/openvpn_shadowsocks/run_container.sh

@@ -5,7 +5,6 @@ sudo docker run -d \
 --restart always \
 --cap-add=NET_ADMIN \
 -p $SHADOWSOCKS_SERVER_PORT:$SHADOWSOCKS_SERVER_PORT/tcp \
--p $SHADOWSOCKS_SERVER_PORT:$SHADOWSOCKS_SERVER_PORT/udp \
 --name $CONTAINER_NAME $CONTAINER_NAME
 
 sudo docker network connect amnezia-dns-net $CONTAINER_NAME

client/server_scripts/setup_host_firewall.sh

@@ -1,27 +1,31 @@
-sudo sysctl -w net.ipv4.ip_forward=1;\
-sudo iptables -C INPUT -p icmp --icmp-type echo-request -j DROP || sudo iptables -A INPUT -p icmp --icmp-type echo-request -j DROP;\
-sudo iptables -C FORWARD -j DOCKER-USER || sudo iptables -A FORWARD -j DOCKER-USER;\
-sudo iptables -C FORWARD -j DOCKER-ISOLATION-STAGE-1 || sudo iptables -A FORWARD -j DOCKER-ISOLATION-STAGE-1;\
-sudo iptables -C FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT || sudo iptables -A FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT;\
-sudo iptables -C FORWARD -o docker0 -j DOCKER || sudo iptables -A FORWARD -o docker0 -j DOCKER;\
-sudo iptables -C FORWARD -i docker0 ! -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 ! -o docker0 -j ACCEPT;\
-sudo iptables -C FORWARD -i docker0 -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 -o docker0 -j ACCEPT;\
-sudo sysctl fs.file-max=51200;\
-sudo sysctl net.core.rmem_max=67108864;\
-sudo sysctl net.core.wmem_max=67108864;\
-sudo sysctl net.core.netdev_max_backlog=250000;\
-sudo sysctl net.core.somaxconn=4096;\
-sudo sysctl net.ipv4.tcp_syncookies=1;\
-sudo sysctl net.ipv4.tcp_tw_reuse=1;\
-sudo sysctl net.ipv4.tcp_tw_recycle=0;\
-sudo sysctl net.ipv4.tcp_fin_timeout=30;\
-sudo sysctl net.ipv4.tcp_keepalive_time=1200;\
-sudo sysctl net.ipv4.ip_local_port_range="10000 65000";\
-sudo sysctl net.ipv4.tcp_max_syn_backlog=8192;\
-sudo sysctl net.ipv4.tcp_max_tw_buckets=5000;\
-sudo sysctl net.ipv4.tcp_fastopen=3;\
-sudo sysctl net.ipv4.tcp_mem="25600 51200 102400";\
-sudo sysctl net.ipv4.tcp_rmem="4096 87380 67108864";\
-sudo sysctl net.ipv4.tcp_wmem="4096 65536 67108864";\
-sudo sysctl net.ipv4.tcp_mtu_probing=1;\
+sudo sysctl -w net.ipv4.ip_forward=1
+sudo iptables -C INPUT -p icmp --icmp-type echo-request -j DROP || sudo iptables -A INPUT -p icmp --icmp-type echo-request -j DROP
+
+#sudo iptables -P FORWARD ACCEPT
+sudo iptables -C FORWARD -j DOCKER-USER || sudo iptables -A FORWARD -j DOCKER-USER
+sudo iptables -C FORWARD -j DOCKER-ISOLATION-STAGE-1 || sudo iptables -A FORWARD -j DOCKER-ISOLATION-STAGE-1; \
+sudo iptables -C FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT || sudo iptables -A FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT; \
+sudo iptables -C FORWARD -o docker0 -j DOCKER || sudo iptables -A FORWARD -o docker0 -j DOCKER; \
+sudo iptables -C FORWARD -i docker0 ! -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 ! -o docker0 -j ACCEPT; \
+sudo iptables -C FORWARD -i docker0 -o docker0 -j ACCEPT || sudo iptables -A FORWARD -i docker0 -o docker0 -j ACCEPT
+
+# Tuning network
+sudo sysctl fs.file-max=51200; \
+sudo sysctl net.core.rmem_max=67108864; \
+sudo sysctl net.core.wmem_max=67108864; \
+sudo sysctl net.core.netdev_max_backlog=250000; \
+sudo sysctl net.core.somaxconn=4096; \
+sudo sysctl net.ipv4.tcp_syncookies=1; \
+sudo sysctl net.ipv4.tcp_tw_reuse=1; \
+sudo sysctl net.ipv4.tcp_tw_recycle=0; \
+sudo sysctl net.ipv4.tcp_fin_timeout=30; \
+sudo sysctl net.ipv4.tcp_keepalive_time=1200; \
+sudo sysctl net.ipv4.ip_local_port_range="10000 65000"; \
+sudo sysctl net.ipv4.tcp_max_syn_backlog=8192; \
+sudo sysctl net.ipv4.tcp_max_tw_buckets=5000; \
+sudo sysctl net.ipv4.tcp_fastopen=3; \
+sudo sysctl net.ipv4.tcp_mem="25600 51200 102400"; \
+sudo sysctl net.ipv4.tcp_rmem="4096 87380 67108864"; \
+sudo sysctl net.ipv4.tcp_wmem="4096 65536 67108864"; \
+sudo sysctl net.ipv4.tcp_mtu_probing=1; \
 sudo sysctl net.ipv4.tcp_congestion_control=hybla

client/server_scripts/socks5_proxy/Dockerfile

@@ -1,10 +0,0 @@
-FROM 3proxy/3proxy:latest
-
-LABEL maintainer="AmneziaVPN" 
-
-RUN mkdir -p /opt/amnezia
-RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
-RUN chmod a+x /opt/amnezia/start.sh
-
-ENTRYPOINT [ "/bin/sh", "/opt/amnezia/start.sh" ]
-CMD [ "" ]

client/server_scripts/socks5_proxy/configure_container.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo -e "#!/bin/3proxy" > /usr/local/3proxy/conf/3proxy.cfg
-echo -e "config /usr/local/3proxy/conf/3proxy.cfg" >> /usr/local/3proxy/conf/3proxy.cfg
-echo -e "timeouts 1 5 30 60 180 1800 15 60" >> /usr/local/3proxy/conf/3proxy.cfg
-
-echo -e "$SOCKS5_USER" >> /usr/local/3proxy/conf/3proxy.cfg
-
-echo -e "log /usr/local/3proxy/logs/3proxy.log" >> /usr/local/3proxy/conf/3proxy.cfg
-echo -e "logformat \"-\\\"\"+_G{\"\"time_unix\"\":%t, \"\"proxy\"\":{\"\"type:\"\":\"\"%N\"\", \"\"port\"\":%p}, \"\"error\"\":{\"\"code\"\":\"\"%E\"\"}, \"\"auth\"\":{\"\"user\"\":\"\"%U\"\"}, \"\"client\"\":{\"\"ip\"\":\"\"%C\"\", \"\"port\"\":%c}, \"\"server\"\":{\"\"ip\"\":\"\"%R\"\", \"\"port\"\":%r}, \"\"bytes\"\":{\"\"sent\"\":%O, \"\"received\"\":%I}, \"\"request\"\":{\"\"hostname\"\":\"\"%n\"\"}, \"\"message\"\":\"\"%T\"\"}\"" >> /usr/local/3proxy/conf/3proxy.cfg
-echo -e "auth $SOCKS5_AUTH_TYPE" >> /usr/local/3proxy/conf/3proxy.cfg
-echo -e "socks -p$SOCKS5_PROXY_PORT" >> /usr/local/3proxy/conf/3proxy.cfg

client/server_scripts/socks5_proxy/run_container.sh

@@ -1,5 +0,0 @@
-sudo docker run -d \
---restart always \
--p $SOCKS5_PROXY_PORT:$SOCKS5_PROXY_PORT/tcp \
---name $CONTAINER_NAME \
-$CONTAINER_NAME

client/server_scripts/socks5_proxy/start.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# This scripts copied from Amnezia client to Docker container to /opt/amnezia and launched every time container starts
-
-echo "Container startup"
-
-/bin/3proxy /usr/local/3proxy/conf/3proxy.cfg

client/translations/amneziavpn_ar_EG.ts

@@ -39,7 +39,7 @@
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="115"/>
-        <source>Settings updated successfully, reconnnection...</source>
+        <source>Settings updated successfully, Reconnnection...</source>
         <translation>تم تحديث الاعدادات بنجاح, جاري إعادة الاتصال...</translation>
     </message>
     <message>
@@ -700,8 +700,8 @@ Already installed containers were found on the server. All installed containers
     <name>PageProtocolShadowSocksSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="80"/>
-        <source>Shadowsocks settings</source>
-        <translation>Shadowsocks  إعدادات</translation>
+        <source>ShadowSocks settings</source>
+        <translation>ShadowSocks  إعدادات</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="89"/>
@@ -1041,8 +1041,8 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="115"/>
-        <source>GitHub</source>
-        <translation>GitHub</translation>
+        <source>Github</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="119"/>
@@ -1317,7 +1317,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     <name>PageSettingsDns</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="39"/>
-        <source>Default server does not support custom DNS</source>
+        <source>Default server does not support custom dns</source>
         <translation>الخادم الافتراضي لا يدعم DNS مخصص</translation>
     </message>
     <message>
@@ -1390,7 +1390,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="64"/>
-        <source>Enabling this function will save application&apos;s logs automatically. By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
+        <source>Enabling this function will save application&apos;s logs automatically, By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
         <translation>سيتم حفظ سجلات البرنامج بشكل تلقائي عند تفعيل هذه الميزة, بشكل افتراضي, هذه الميزة مٌعطلة. قم بتفعيل هذه الميزة في حالة هناك خلل في التطبيق.</translation>
     </message>
     <message>
@@ -1797,7 +1797,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="89"/>
-        <source>QR code</source>
+        <source>QR-code</source>
         <translation>رمز QR</translation>
     </message>
     <message>
@@ -2089,8 +2089,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="79"/>
-        <source>Save Shadowsocks config</source>
-        <translation>احفظ تكوين Shadowsocks</translation>
+        <source>Save ShadowSocks config</source>
+        <translation>احفظ تكوين ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
@@ -2119,8 +2119,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="131"/>
-        <source>Shadowsocks native format</source>
-        <translation>تنسيق Shadowsocks الاصلي</translation>
+        <source>ShadowSocks native format</source>
+        <translation>تنسيق ShadowSocks الاصلي</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="136"/>
@@ -2571,8 +2571,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     <name>QObject</name>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="77"/>
-        <source>SFTP service</source>
-        <translation>خدمة SFTP</translation>
+        <source>Sftp service</source>
+        <translation>خدمة Sftp</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="11"/>
@@ -2581,7 +2581,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="12"/>
-        <source>Unknown error</source>
+        <source>Unknown Error</source>
         <translation>خطأ غير معروف</translation>
     </message>
     <message>
@@ -2621,18 +2621,18 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
-        <source>SSH request was denied</source>
-        <translation>طلب SSH محظو</translation>
+        <source>Ssh request was denied</source>
+        <translation>طلب Ssh محظو</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
-        <source>SSH request was interrupted</source>
-        <translation>إنقطع طلب SSH</translation>
+        <source>Ssh request was interrupted</source>
+        <translation>إنقطع طلب Ssh</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
-        <source>SSH internal error</source>
-        <translation>مشكلة داخلية SSH</translation>
+        <source>Ssh internal error</source>
+        <translation>مشكلة داخلية Ssh</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
@@ -2720,7 +2720,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="32"/>
-        <source>SCP error: Generic failure</source>
+        <source>Scp error: Generic failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2735,8 +2735,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="40"/>
-        <source>Shadowsocks (ss-local) executable missing</source>
-        <translation>Shadowsocks (ss-local) executable مفقود</translation>
+        <source>ShadowSocks (ss-local) executable missing</source>
+        <translation>ShadowSocks (ss-local) executable مفقود</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
@@ -2821,13 +2821,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="91"/>
-        <source>AmneziaDNS</source>
-        <translation>AmneziaDNS</translation>
+        <source>Amnezia DNS</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="92"/>
-        <source>SFTP file sharing service</source>
-        <translation>ملف SFTP: خدمة المشاركة</translation>
+        <source>Sftp file sharing service</source>
+        <translation>ملف Sftp: خدمة المشاركة</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
@@ -2836,8 +2836,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="101"/>
-        <source>Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
-        <translation>بروتوكول Shadowsocks- يتنكر في حركة مرور VPN, يبدو ك حركة مرور الويب العادية
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
+        <translation>بروتوكول ShadowSocks- يتنكر في حركة مرور VPN, يبدو ك حركة مرور الويب العادية
 ولكن قد يتم التعرف عليه من خلال أنظمة التحليل في بعض المناطق شديدة الرقابة.</translation>
     </message>
     <message>
@@ -2944,8 +2944,8 @@ For more detailed information, you can
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
-        <source>IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
-        <translation>بروتوكول IKEv2/IPsec - بروتوكول مستقر حديث, اسرع بقليل من الباقي, يسترجع الاتصال بعد خسارة الاشارة.</translation>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
+        <translation>بروتوكول IKEv2 - بروتوكول مستقر حديث, اسرع بقليل من الباقي, يسترجع الاتصال بعد خسارة الاشارة.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="118"/>
@@ -2981,12 +2981,16 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
         <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
 
 * Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
         <translation>Shadowsocks, مستوحي من بروتوكول SOCKS5, يحمي الاتصال بأستعمال شفرة AEAD. كذلك Shadowsocks صٌمم كي يكون متحفظاً ويصعب تحديدة, إنه ليس مطابقًا لاتصال HTTPS القياسي. عمتاُ. بعض انظمة تحليل حركات المرور قد تتعرف علي اتصال Shadowsocks. بسبب الدعم المحدود في Amnezia, يٌنصح بأستخدام بروتوكول AmneziaWG.
 
 * مٌتاح في AmneziaVPN عبر جميع المنصات
+* استهلاك طاقة عادي علي اجهزة المحمول
+
 * بروتوكول تشفير قابل للتكوين
 * قابل للكشف بواسطة بعض انظمة DPI
 * يعمل عبر بروتوكول شبكة TCP.</translation>

client/translations/amneziavpn_fa_IR.ts

@@ -22,7 +22,7 @@
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="115"/>
-        <source>Settings updated successfully, reconnnection...</source>
+        <source>Settings updated successfully, Reconnnection...</source>
         <translation>تنظیمات به روز رسانی شد
 در حال اتصال دوباره...</translation>
     </message>
@@ -664,8 +664,8 @@ Already installed containers were found on the server. All installed containers
     <name>PageProtocolShadowSocksSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="80"/>
-        <source>Shadowsocks settings</source>
-        <translation>تنظیمات Shadowsocks</translation>
+        <source>ShadowSocks settings</source>
+        <translation>تنظیمات ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="89"/>
@@ -1002,8 +1002,8 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="115"/>
-        <source>GitHub</source>
-        <translation>GitHub</translation>
+        <source>Github</source>
+        <translation>Github</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="119"/>
@@ -1250,7 +1250,7 @@ Already installed containers were found on the server. All installed containers
     <name>PageSettingsDns</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="39"/>
-        <source>Default server does not support custom DNS</source>
+        <source>Default server does not support custom dns</source>
         <translation>سرور پیش‌فرض از دی‌ان‌اس سفارشی پشتیبانی نمی‌کند</translation>
     </message>
     <message>
@@ -1323,7 +1323,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="64"/>
-        <source>Enabling this function will save application&apos;s logs automatically. By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
+        <source>Enabling this function will save application&apos;s logs automatically, By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
         <translation>فعال کردن این عملکرد باعث ذخیره خودکار لاگ‌های برنامه می‌شود. به طور پیش‌فرض، قابلیت ثبت لاگ غیرفعال است. در صورت بروز خطا در برنامه، ذخیره لاگ را فعال کنید.</translation>
     </message>
     <message>
@@ -1710,7 +1710,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="89"/>
-        <source>QR code</source>
+        <source>QR-code</source>
         <translation>QR-Code</translation>
     </message>
     <message>
@@ -2037,8 +2037,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="79"/>
-        <source>Save Shadowsocks config</source>
-        <translation>ذخیره تنظیمات Shadowsocks</translation>
+        <source>Save ShadowSocks config</source>
+        <translation>ذخیره تنظیمات ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
@@ -2057,8 +2057,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="131"/>
-        <source>Shadowsocks native format</source>
-        <translation>فرمت Shadowsocks</translation>
+        <source>ShadowSocks native format</source>
+        <translation>فرمت ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="136"/>
@@ -2476,8 +2476,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="12"/>
-        <source>Unknown error</source>
-        <translation>Unknown error</translation>
+        <source>Unknown Error</source>
+        <translation>Unknown Error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="13"/>
@@ -2516,18 +2516,18 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
-        <source>SSH request was denied</source>
-        <translation>SSH request was denied</translation>
+        <source>Ssh request was denied</source>
+        <translation>Ssh request was denied</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
-        <source>SSH request was interrupted</source>
-        <translation>SSH request was interrupted</translation>
+        <source>Ssh request was interrupted</source>
+        <translation>Ssh request was interrupted</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
-        <source>SSH internal error</source>
-        <translation>SSH internal error</translation>
+        <source>Ssh internal error</source>
+        <translation>Ssh internal error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
@@ -2628,7 +2628,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="32"/>
-        <source>SCP error: Generic failure</source>
+        <source>Scp error: Generic failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2643,8 +2643,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="40"/>
-        <source>Shadowsocks (ss-local) executable missing</source>
-        <translation>Shadowsocks (ss-local) executable missing</translation>
+        <source>ShadowSocks (ss-local) executable missing</source>
+        <translation>ShadowSocks (ss-local) executable missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
@@ -2718,7 +2718,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="101"/>
-        <source>Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
         <translation>شدوساکس - ترافیک VPN را پنهان می کند، به طوری که مشابه ترافیک وب عادی می شود، اما ممکن است توسط سیستم های تجزیه و تحلیل در برخی از مناطق با سانسور شدید شناسایی شود.</translation>
     </message>
     <message>
@@ -2819,8 +2819,8 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="92"/>
-        <source>SFTP file sharing service</source>
-        <translation>سرویس فایل اشتراک SFTP</translation>
+        <source>Sftp file sharing service</source>
+        <translation>سرویس فایل اشتراک Sftp</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
@@ -2830,8 +2830,8 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="91"/>
-        <source>AmneziaDNS</source>
-        <translation>AmneziaDNS</translation>
+        <source>Amnezia DNS</source>
+        <translation>Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
@@ -2850,8 +2850,8 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
-        <source>IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
-        <translation>پروتکل IKEv2/IPsec پروتکلی پایدار و مدرن که مقداری سریعتر از سایر پروتکل‎هاست. بعد از قطع سیگنال دوباره اتصال را بازیابی می‎کند.</translation>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
+        <translation>پروتکل IKEv2 پروتکلی پایدار و مدرن که مقداری سریعتر از سایر پروتکل‎هاست. بعد از قطع سیگنال دوباره اتصال را بازیابی می‎کند.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="118"/>
@@ -2891,12 +2891,15 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
         <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
 
 * Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
         <translation>پروتکل Shadowsocks، الهام گرفته از پروتکل Socks5، اتصال را با استفاده از رمزگذاری AEAD امن میکند. اگرچه Shadowsocks طوری طراحی شده که برای شناسایی در شبکه چالش‎برانگیز باشد و محتاط عمل کند اما این پروتکل مانند یک اتصال استاندارد HTTPS نیست و برخی از سیستم‎های تحلیل ترافیک مشخص ممکن است بتوانند اتصال Shadowsocks را شناسایی کنند. به دلیل محدودیت پشتیبانی در Amnezia پیشنهاد می‎شود که از َAmneziaWG استفاده شود.
 
 * فقط بر روی پلتفرم دسکتاپ بر روی Amnezia قابل دسترس است
+* مصرف انرژی عادی در دستگاه‎های موبایل
 * پروتکل رمزنگاری قابل پیکربندی
 * قابل شناسایی توسط برخی سیستم‎های تحلیل عمیق DPI
 * عملکرد بر روی پروتکل شبکه TCP</translation>
@@ -2943,8 +2946,8 @@ For more detailed information, you can
     </message>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="77"/>
-        <source>SFTP service</source>
-        <translation>سرویس SFTP</translation>
+        <source>Sftp service</source>
+        <translation>سرویس Sftp</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>

client/translations/amneziavpn_hi_IN.ts

@@ -86,7 +86,7 @@
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="162"/>
-        <source>Settings updated successfully, reconnnection...</source>
+        <source>Settings updated successfully, Reconnnection...</source>
         <translation>सेटिंग्स सफलतापूर्वक अपडेट हो गईं...</translation>
     </message>
     <message>
@@ -711,7 +711,7 @@ Already installed containers were found on the server. All installed containers
     <name>PageProtocolShadowSocksSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="95"/>
-        <source>Shadowsocks settings</source>
+        <source>ShadowSocks settings</source>
         <translation>शैडोसॉक्स सेटिंग्स</translation>
     </message>
     <message>
@@ -1055,13 +1055,13 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="140"/>
-        <source>GitHub</source>
-        <translation>GitHub</translation>
+        <source>Github</source>
+        <translation>Github</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="147"/>
         <source>https://github.com/amnezia-vpn/amnezia-client</source>
-        <translation>https://github.com/amnezia-vpn/amnezia-client</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="158"/>
@@ -1144,7 +1144,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAppSplitTunneling.qml" line="278"/>
         <source>Executable file (*.*)</source>
-        <translation>निष्पादनीय फाइल (*.*)</translation>
+        <translation>निष्पादनीय फाइल (*।*)</translation>
     </message>
 </context>
 <context>
@@ -1276,7 +1276,7 @@ Already installed containers were found on the server. All installed containers
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="102"/>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="134"/>
         <source>Backup files (*.backup)</source>
-        <translation>बैकअप फ़ाइलें (*.backup)</translation>
+        <translation>बैकअप फ़ाइलें (*.बैकअप)</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="111"/>
@@ -1386,7 +1386,7 @@ Already installed containers were found on the server. All installed containers
     <name>PageSettingsDns</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="46"/>
-        <source>Default server does not support custom DNS</source>
+        <source>Default server does not support custom dns</source>
         <translation>डिफ़ॉल्ट सर्वर कस्टम डीएनएस का समर्थन नहीं करता है</translation>
     </message>
     <message>
@@ -1459,7 +1459,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="69"/>
-        <source>Enabling this function will save application&apos;s logs automatically. By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
+        <source>Enabling this function will save application&apos;s logs automatically, By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
         <translation>इस फ़ंक्शन को सक्षम करने से एप्लिकेशन के लॉग स्वचालित रूप से सहेजे जाएंगे, डिफ़ॉल्ट रूप से, लॉगिंग कार्यक्षमता अक्षम है। एप्लिकेशन की खराबी की स्थिति में लॉग सेविंग सक्षम करें.</translation>
     </message>
     <message>
@@ -1480,7 +1480,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="143"/>
         <source>Logs files (*.log)</source>
-        <translation>लॉग फ़ाइलें (*.log)</translation>
+        <translation>लॉग फ़ाइलें (*.लॉग)</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="152"/>
@@ -1868,7 +1868,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="102"/>
-        <source>QR code</source>
+        <source>QR-code</source>
         <translation>क्यू आर संहिता</translation>
     </message>
     <message>
@@ -2164,7 +2164,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="81"/>
-        <source>Save Shadowsocks config</source>
+        <source>Save ShadowSocks config</source>
         <translation>शैडोसॉक्स कॉन्फ़िगरेशन सहेजें</translation>
     </message>
     <message>
@@ -2199,7 +2199,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="140"/>
-        <source>Shadowsocks native format</source>
+        <source>ShadowSocks native format</source>
         <translation>शैडोसॉक्स मूल प्रारूप</translation>
     </message>
     <message>
@@ -2663,7 +2663,7 @@ Already installed containers were found on the server. All installed containers
     <name>QObject</name>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="78"/>
-        <source>SFTP service</source>
+        <source>Sftp service</source>
         <translation>एसएफटीपी सेवा</translation>
     </message>
     <message>
@@ -2673,7 +2673,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="12"/>
-        <source>Unknown error</source>
+        <source>Unknown Error</source>
         <translation>अज्ञात त्रुटि</translation>
     </message>
     <message>
@@ -2718,18 +2718,18 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
-        <source>SSH request was denied</source>
-        <translation>SSH अनुरोध अस्वीकार कर दिया गया</translation>
+        <source>Ssh request was denied</source>
+        <translation>Ssh अनुरोध अस्वीकार कर दिया गया</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
-        <source>SSH request was interrupted</source>
-        <translation>SSH अनुरोध बाधित हो गया था</translation>
+        <source>Ssh request was interrupted</source>
+        <translation>Ssh अनुरोध बाधित हो गया था</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
-        <source>SSH internal error</source>
-        <translation>SSH आंतरिक त्रुटि</translation>
+        <source>Ssh internal error</source>
+        <translation>Ssh आंतरिक त्रुटि</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="28"/>
@@ -2773,7 +2773,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="33"/>
-        <source>SCP error: Generic failure</source>
+        <source>Scp error: Generic failure</source>
         <translation>एससीपी त्रुटि: सामान्य विफलता</translation>
     </message>
     <message>
@@ -2788,7 +2788,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
-        <source>Shadowsocks (ss-local) executable missing</source>
+        <source>ShadowSocks (ss-local) executable missing</source>
         <translation>शैडोसॉक्स (एसएस-स्थानीय) निष्पादन योग्य गायब है</translation>
     </message>
     <message>
@@ -2874,13 +2874,13 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="97"/>
-        <source>AmneziaDNS</source>
-        <translation>AmneziaDNS</translation>
+        <source>Amnezia DNS</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
-        <source>SFTP file sharing service</source>
-        <translation>SFTP फ़ाइल साझाकरण सेवा</translation>
+        <source>Sftp file sharing service</source>
+        <translation>Sftp फ़ाइल साझाकरण सेवा</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="104"/>
@@ -2889,7 +2889,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="107"/>
-        <source>Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
         <translation>शैडोसॉक्स - वीपीएन ट्रैफ़िक को मास्क करता है, जिससे यह सामान्य वेब ट्रैफ़िक के समान हो जाता है, लेकिन इसे कुछ अत्यधिक सेंसर किए गए क्षेत्रों में विश्लेषण प्रणालियों द्वारा पहचाना जा सकता है.</translation>
     </message>
     <message>
@@ -2998,8 +2998,8 @@ For more detailed information, you can
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="124"/>
-        <source>IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
-        <translation>IKEv2/IPsec - आधुनिक स्थिर प्रोटोकॉल, दूसरों की तुलना में थोड़ा तेज़, सिग्नल हानि के बाद कनेक्शन पुनर्स्थापित करता है।</translation>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
+        <translation>IKEv2 - आधुनिक स्थिर प्रोटोकॉल, दूसरों की तुलना में थोड़ा तेज़, सिग्नल हानि के बाद कनेक्शन पुनर्स्थापित करता है।</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="127"/>
@@ -3035,12 +3035,16 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
         <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
 
 * Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
         <translation>शैडोसॉक्स, SOCKS5 प्रोटोकॉल से प्रेरित होकर, AEAD सिफर का उपयोग करके कनेक्शन की सुरक्षा करता है। हालाँकि शैडोसॉक्स को विवेकपूर्ण और पहचानने में चुनौतीपूर्ण बनाया गया है, यह एक मानक HTTPS कनेक्शन के समान नहीं है। हालाँकि, कुछ ट्रैफ़िक विश्लेषण प्रणालियाँ अभी भी शैडोसॉक्स कनेक्शन का पता लगा सकती हैं। Amnezia में सीमित समर्थन के कारण, AmneziaWG प्रोटोकॉल का उपयोग करने की अनुशंसा की जाती है।
 
 * AmneziaVPN केवल डेस्कटॉप प्लेटफ़ॉर्म पर उपलब्ध है
+* मोबाइल उपकरणों पर सामान्य बिजली की खपत
+
 * कॉन्फ़िगर करने योग्य एन्क्रिप्शन प्रोटोकॉल
 * कुछ डीपीआई सिस्टम द्वारा पता लगाने योग्य
 * टीसीपी नेटवर्क प्रोटोकॉल पर काम करता है।.</translation>

client/translations/amneziavpn_my_MM.ts

@@ -22,7 +22,7 @@
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="115"/>
-        <source>Settings updated successfully, reconnnection...</source>
+        <source>Settings updated successfully, Reconnnection...</source>
         <translation>ဆက်တင်များကို အောင်မြင်စွာ အပ်ဒိတ်လုပ်ပြီးပါပြီ၊ ပြန်လည်ချိတ်ဆက်နေပါသည်...</translation>
     </message>
     <message>
@@ -664,8 +664,8 @@ Already installed containers were found on the server. All installed containers
     <name>PageProtocolShadowSocksSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="80"/>
-        <source>Shadowsocks settings</source>
-        <translation>Shadowsocks ဆက်တင်များ</translation>
+        <source>ShadowSocks settings</source>
+        <translation>ShadowSocks ဆက်တင်များ</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="89"/>
@@ -1002,8 +1002,8 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="115"/>
-        <source>GitHub</source>
-        <translation>GitHub</translation>
+        <source>Github</source>
+        <translation>Github</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="119"/>
@@ -1250,8 +1250,8 @@ Already installed containers were found on the server. All installed containers
     <name>PageSettingsDns</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="39"/>
-        <source>Default server does not support custom DNS</source>
-        <translation>မူရင်းဆာဗာသည် စိတ်ကြိုက် DNS ကို အထောက်အပံ့မပေးပါ</translation>
+        <source>Default server does not support custom dns</source>
+        <translation>မူရင်းဆာဗာသည် စိတ်ကြိုက် dns ကို အထောက်အပံ့မပေးပါ</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="57"/>
@@ -1323,7 +1323,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="64"/>
-        <source>Enabling this function will save application&apos;s logs automatically. By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
+        <source>Enabling this function will save application&apos;s logs automatically, By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
         <translation>ဤလုပ်ဆောင်ချက်ကို ဖွင့်ခြင်းဖြင့် အပလီကေးရှင်း၏ မှတ်တမ်းများကို အလိုအလျောက် သိမ်းဆည်းပေးမည် ဖြစ်ပြီး မူရင်းအတိုင်း၊ မှတ်တမ်းလုပ်ဆောင်ချက်ကို ပိတ်ထားသည်။ အပလီကေးရှင်းချို့ယွင်းချက်ရှိသောအခါ မှတ်တမ်းသိမ်းဆည်းခြင်းကို ဖွင့်ပါ။</translation>
     </message>
     <message>
@@ -1711,7 +1711,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="89"/>
-        <source>QR code</source>
+        <source>QR-code</source>
         <translation>QR-ကုဒ်</translation>
     </message>
     <message>
@@ -2038,8 +2038,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="79"/>
-        <source>Save Shadowsocks config</source>
-        <translation>Shadowsocks config ကိုသိမ်းဆည်းမည်</translation>
+        <source>Save ShadowSocks config</source>
+        <translation>ShadowSocks config ကိုသိမ်းဆည်းမည်</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
@@ -2058,8 +2058,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="131"/>
-        <source>Shadowsocks native format</source>
-        <translation>Shadowsocks မူရင်းဖောမတ်</translation>
+        <source>ShadowSocks native format</source>
+        <translation>ShadowSocks မူရင်းဖောမတ်</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="136"/>
@@ -2477,7 +2477,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="12"/>
-        <source>Unknown error</source>
+        <source>Unknown Error</source>
         <translation>အမည်မသိ မှားယွင်းမှု</translation>
     </message>
     <message>
@@ -2517,18 +2517,18 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="24"/>
-        <source>SSH request was denied</source>
-        <translation>SSH တောင်းဆိုမှု ငြင်းဆိုခံလိုက်ရပါသည်</translation>
+        <source>Ssh request was denied</source>
+        <translation>Ssh တောင်းဆိုမှု ငြင်းဆိုခံလိုက်ရပါသည်</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
-        <source>SSH request was interrupted</source>
-        <translation>SSH တောင်းဆိုမှု အနှောက်အယက်ခံလိုက်ရပါသည်</translation>
+        <source>Ssh request was interrupted</source>
+        <translation>Ssh တောင်းဆိုမှု အနှောက်အယက်ခံလိုက်ရပါသည်</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
-        <source>SSH internal error</source>
-        <translation>စက်တွင်းဖြစ်သော SSH မှားယွင်းမှု</translation>
+        <source>Ssh internal error</source>
+        <translation>စက်တွင်းဖြစ်သော Ssh မှားယွင်းမှု</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
@@ -2624,7 +2624,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="32"/>
-        <source>SCP error: Generic failure</source>
+        <source>Scp error: Generic failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2639,8 +2639,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="40"/>
-        <source>Shadowsocks (ss-local) executable missing</source>
-        <translation>Shadowsocks (ss-local) executable ပျောက်နေပါသည်</translation>
+        <source>ShadowSocks (ss-local) executable missing</source>
+        <translation>ShadowSocks (ss-local) executable ပျောက်နေပါသည်</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
@@ -2719,8 +2719,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="101"/>
-        <source>Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
-        <translation>Shadowsocks - ၎င်းသည် ပုံမှန်ဝဘ်လမ်းကြောင်းနှင့် ဆင်တူစေရန် VPN အသွားအလာကို ဖုံးကွယ်ထားသော်လည်း ၎င်းကို အချို့သော ဆင်ဆာဖြတ်ထားသော ဒေသများရှိ ခွဲခြမ်းစိတ်ဖြာမှုစနစ်များက ထောက်လှန်းသိရှိနိုင်ပါသည်.</translation>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
+        <translation>ShadowSocks - ၎င်းသည် ပုံမှန်ဝဘ်လမ်းကြောင်းနှင့် ဆင်တူစေရန် VPN အသွားအလာကို ဖုံးကွယ်ထားသော်လည်း ၎င်းကို အချို့သော ဆင်ဆာဖြတ်ထားသော ဒေသများရှိ ခွဲခြမ်းစိတ်ဖြာမှုစနစ်များက ထောက်လှန်းသိရှိနိုင်ပါသည်.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="104"/>
@@ -2820,8 +2820,8 @@ IKEv2 သည် လုံခြုံရေး၊ တည်ငြိမ်မှ
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="92"/>
-        <source>SFTP file sharing service</source>
-        <translation>SFTP ဖိုင်မျှဝေခြင်းဆားဗစ်</translation>
+        <source>Sftp file sharing service</source>
+        <translation>Sftp ဖိုင်မျှဝေခြင်းဆားဗစ်</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="90"/>
@@ -2831,8 +2831,8 @@ IKEv2 သည် လုံခြုံရေး၊ တည်ငြိမ်မှ
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="91"/>
-        <source>AmneziaDNS</source>
-        <translation>AmneziaDNS</translation>
+        <source>Amnezia DNS</source>
+        <translation>Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
@@ -2851,8 +2851,8 @@ IKEv2 သည် လုံခြုံရေး၊ တည်ငြိမ်မှ
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="115"/>
-        <source>IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
-        <translation>IKEv2/IPsec - ခေတ်မီတည်ငြိမ်သောပရိုတိုကော၊ အခြားအရာများထက်အနည်းငယ်ပိုမြန်သည်၊ signal ပျောက်ဆုံးပြီးနောက် ချိတ်ဆက်မှုကို ပြန်လည်ရယူပေးသည်.</translation>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
+        <translation>IKEv2 - ခေတ်မီတည်ငြိမ်သောပရိုတိုကော၊ အခြားအရာများထက်အနည်းငယ်ပိုမြန်သည်၊ signal ပျောက်ဆုံးပြီးနောက် ချိတ်ဆက်မှုကို ပြန်လည်ရယူပေးသည်.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="118"/>
@@ -2888,12 +2888,16 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
         <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
 
 * Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
         <translation>SOCKS5 ပရိုတိုကောကို အတုယူအခြေခံတည်ဆောက်ထားသော Shadowsocks သည် AEAD cipher ကိုအသုံးပြု၍ ချိတ်ဆက်မှုကိုကာကွယ်ပေးသည်။ Shadowsocks သည် ထောက်လှန်းသိရှိခံရခြင်းမှရှောင်ရှားနိုင်ရန်နှင့် ထောက်လှန်းသည့်သူများခက်ခဲစေရန် ဒီဇိုင်းထုတ်ထားသော်လည်း စံသတ်မှတ်ထားသည့် HTTPS ချိတ်ဆက်မှုနှင့် ထပ်တူမကျပါ။ သို့သော်၊ အချို့သောလမ်းကြောင်းဆိုင်ရာ ခွဲခြမ်းစိတ်ဖြာမှုစနစ်များသည် Shadowsocks ချိတ်ဆက်မှုကို ရှာဖွေတွေ့ရှိနိုင်သေးသည်။ Amnezia တွင် ထောက်ပံ့မှုအကန့်အသတ်ရှိသောကြောင့် AmneziaWG ပရိုတိုကောကို အသုံးပြုရန် အကြံပြုထားသည်။
 
 * Desktop ပလပ်ဖောင်းများတွင်ရှိ‌သော AmneziaVPN တွင်သာအသုံးပြုနိုင်ပါသည်။
+* မိုဘိုင်းစက်ပစ္စည်းများတွင် ပုံမှန်ပါဝါသုံးစွဲမှုရှိခြင်း။
+
 * ပြင်ဆင်သတ်မှတ်နိုင်သော စာဝှက်စနစ် ပရိုတိုကော
 * အချို့သော DPI စနစ်များဖြင့် ထောက်လှန်းသိရှိနိုင်သည်။
 * TCP ကွန်ရက် ပရိုတိုကောပေါ်တွင် အလုပ်လုပ်သည်။.</translation>
@@ -2940,8 +2944,8 @@ For more detailed information, you can
     </message>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="77"/>
-        <source>SFTP service</source>
-        <translation>SFTP ဝန်ဆောင်မှု</translation>
+        <source>Sftp service</source>
+        <translation>Sftp ဝန်ဆောင်မှု</translation>
     </message>
     <message>
         <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>

client/translations/amneziavpn_uk_UA.ts

@@ -86,8 +86,8 @@
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="161"/>
-        <source>Settings updated successfully, reconnnection...</source>
-        <translation>Налаштування оновлено, підключення...</translation>
+        <source>Settings updated successfully, Reconnnection...</source>
+        <translation>Налаштування оновлено, Підключення...</translation>
     </message>
     <message>
         <location filename="../ui/controllers/connectionController.cpp" line="164"/>
@@ -771,8 +771,8 @@ Already installed containers were found on the server. All installed containers
     <name>PageProtocolShadowSocksSettings</name>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="80"/>
-        <source>Shadowsocks settings</source>
-        <translation>Налаштування Shadowsocks</translation>
+        <source>ShadowSocks settings</source>
+        <translation>Налаштування ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageProtocolShadowSocksSettings.qml" line="91"/>
@@ -1138,8 +1138,8 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="115"/>
-        <source>GitHub</source>
-        <translation>GitHub</translation>
+        <source>Github</source>
+        <translation>Github</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="119"/>
@@ -1413,7 +1413,7 @@ Already installed containers were found on the server. All installed containers
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="50"/>
         <source>Use AmneziaDNS</source>
-        <translation>Використовувати AmneziaDNS</translation>
+        <translation>Використовувати Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="51"/>
@@ -1459,7 +1459,7 @@ Already installed containers were found on the server. All installed containers
     <name>PageSettingsDns</name>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="39"/>
-        <source>Default server does not support custom DNS</source>
+        <source>Default server does not support custom dns</source>
         <translation type="unfinished">Сервер за замовчуванням не підтримує користувацький DNS</translation>
     </message>
     <message>
@@ -1536,7 +1536,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="60"/>
-        <source>Enabling this function will save application&apos;s logs automatically. By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
+        <source>Enabling this function will save application&apos;s logs automatically, By default, logging functionality is disabled. Enable log saving in case of application malfunction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1975,7 +1975,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="89"/>
-        <source>QR code</source>
+        <source>QR-code</source>
         <translation>QR-код</translation>
     </message>
     <message>
@@ -2368,8 +2368,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="81"/>
-        <source>Save Shadowsocks config</source>
-        <translation type="unfinished">Зберегти конфігурацію Shadowsocks</translation>
+        <source>Save ShadowSocks config</source>
+        <translation type="unfinished">Зберегти конфігурацію ShadowSocks</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="88"/>
@@ -2393,8 +2393,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="140"/>
-        <source>Shadowsocks native format</source>
-        <translation type="unfinished">Shadowsocks нативний формат</translation>
+        <source>ShadowSocks native format</source>
+        <translation type="unfinished">ShadowSocks нативний формат</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageShare.qml" line="145"/>
@@ -2820,8 +2820,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="12"/>
-        <source>Unknown error</source>
-        <translation>Unknown error</translation>
+        <source>Unknown Error</source>
+        <translation>Unknown Error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="13"/>
@@ -2865,18 +2865,18 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="25"/>
-        <source>SSH request was denied</source>
-        <translation>SSH request was denied</translation>
+        <source>Ssh request was denied</source>
+        <translation>Ssh request was denied</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="26"/>
-        <source>SSH request was interrupted</source>
-        <translation>SSH request was interrupted</translation>
+        <source>Ssh request was interrupted</source>
+        <translation>Ssh request was interrupted</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="27"/>
-        <source>SSH internal error</source>
-        <translation>SSH internal error</translation>
+        <source>Ssh internal error</source>
+        <translation>Ssh internal error</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="28"/>
@@ -2895,7 +2895,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="33"/>
-        <source>SCP error: Generic failure</source>
+        <source>Scp error: Generic failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2991,8 +2991,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="41"/>
-        <source>Shadowsocks (ss-local) executable missing</source>
-        <translation>Shadowsocks (ss-local) executable missing</translation>
+        <source>ShadowSocks (ss-local) executable missing</source>
+        <translation>ShadowSocks (ss-local) executable missing</translation>
     </message>
     <message>
         <location filename="../core/errorstrings.cpp" line="42"/>
@@ -3071,13 +3071,13 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="107"/>
-        <source>Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
-        <translation type="unfinished">Shadowsocks - маскує VPN-трафік під звичайний веб-трафік, але розпізнається системами аналізу трафіка в деяких регіонах з високим рівнем цензури.</translation>
+        <source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions.</source>
+        <translation type="unfinished">ShadowSocks - маскує VPN-трафік під звичайний веб-трафік, але розпізнається системами аналізу трафіка в деяких регіонах з високим рівнем цензури.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="110"/>
         <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
-        <translation type="unfinished">OpenVPN over Cloak - OpenVPN з маскуванням VPN під HTTPS трафік і захистом від active-probing. Підходить для регіонів з самим високим рівнем цензури.</translation>
+        <translation type="unfinished">OpenVPN over Cloak - OpenVPN з маскуванням VPN під HTTPS трафік і захистом від active-probbing. Підходить для регіонів з самим високим рівнем цензури.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="131"/>
@@ -3142,7 +3142,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 Він може швидко переключись між мережами та пристроями, що робить його осболиво адаптованим під динамічні мережеві середовища.
 Потрібно зазначити, що незважаючи на стабільність та швидкість, IKEv2 легко розпізнається та вразливий до блокувань. 
 
-* IKEv2/IPsec в AmneziaVPN тільки для Windows.
+* IKEv2 в AmneziaVPN тільки для Windows.
 * Низьке енергоспоживання, на мобільних пристроях
 * Мінімальна конфігурація
 * Розпізнається системами DPI-анализу
@@ -3155,8 +3155,8 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="98"/>
-        <source>SFTP file sharing service</source>
-        <translation>Сервіс обміну файлами SFTP</translation>
+        <source>Sftp file sharing service</source>
+        <translation>Сервіс обміну файлами Sftp</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="96"/>
@@ -3166,8 +3166,8 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="97"/>
-        <source>AmneziaDNS</source>
-        <translation>AmneziaDNS</translation>
+        <source>Amnezia DNS</source>
+        <translation>Amnezia DNS</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="104"/>
@@ -3191,8 +3191,8 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="124"/>
-        <source>IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
-        <translation>IKEv2/IPsec сучасний стабільний протокол, трішки швидше за інших відновлює підключення.</translation>
+        <source>IKEv2 -  Modern stable protocol, a bit faster than others, restores connection after signal loss.</source>
+        <translation>IKEv2 сучасний стабільний протокол, трішки швидше за інших відновлює підключення.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="127"/>
@@ -3202,7 +3202,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
     <message>
         <location filename="../containers/containers_defs.cpp" line="129"/>
         <source>Replace the current DNS server with your own. This will increase your privacy level.</source>
-        <translation>Замініть DNS-сервер на AmneziaDNS. Це підвищить вашу рівень захищеності в інтернеті.</translation>
+        <translation>Замініть DNS-сервер на Amnezia DNS. Це підвищить вашу рівень захищеності в інтернеті.</translation>
     </message>
     <message>
         <location filename="../containers/containers_defs.cpp" line="138"/>
@@ -3228,6 +3228,8 @@ It employs its unique security protocol, leveraging the strength of SSL/TLS for
         <source>Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn&apos;t identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it&apos;s recommended to use AmneziaWG protocol.
 
 * Available in the AmneziaVPN only on desktop platforms
+* Normal power consumption on mobile devices
+
 * Configurable encryption protocol
 * Detectable by some DPI systems
 * Works over TCP network protocol.</source>
@@ -3338,7 +3340,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
     </message>
     <message>
         <location filename="../protocols/protocols_defs.cpp" line="78"/>
-        <source>SFTP service</source>
+        <source>Sftp service</source>
         <translation>Сервіс SFTP</translation>
     </message>
     <message>