added changelog drawer

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.8.3.0
+project(${PROJECT} VERSION 4.8.2.0
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )

client/amnezia_application.cpp

@@ -463,4 +463,15 @@ void AmneziaApplication::initControllers()
 
     m_systemController.reset(new SystemController(m_settings));
     m_engine->rootContext()->setContextProperty("SystemController", m_systemController.get());
+
+    m_updateController.reset(new UpdateController(m_settings));
+    m_engine->rootContext()->setContextProperty("UpdateController", m_updateController.get());
+
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    connect(m_updateController.get(), &UpdateController::updateFound, this, [this]() {
+        QTimer::singleShot(1000, this, [this]() { m_pageController->showChangelogDrawer(); });
+    });
+
+    m_updateController->checkForUpdates();
+#endif
 }

client/amnezia_application.h

@@ -25,6 +25,7 @@
 #include "ui/controllers/sitesController.h"
 #include "ui/controllers/systemController.h"
 #include "ui/controllers/appSplitTunnelingController.h"
+#include "ui/controllers/updateController.h"
 #include "ui/models/containers_model.h"
 #include "ui/models/languageModel.h"
 #include "ui/models/protocols/cloakConfigModel.h"
@@ -134,6 +135,7 @@ class AmneziaApplication : public AMNEZIA_BASE_CLASS
     QScopedPointer<SitesController> m_sitesController;
     QScopedPointer<SystemController> m_systemController;
     QScopedPointer<AppSplitTunnelingController> m_appSplitTunnelingController;
+    QScopedPointer<UpdateController> m_updateController;
 
     QNetworkAccessManager *m_nam;
 

client/client_scripts/linux_installer.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+EXTRACT_DIR="$1"
+INSTALLER_PATH="$2"
+
+# Create and clean extract directory
+rm -rf "$EXTRACT_DIR"
+mkdir -p "$EXTRACT_DIR"
+
+# Extract ZIP archive
+unzip "$INSTALLER_PATH" -d "$EXTRACT_DIR"
+if [ $? -ne 0 ]; then
+    echo 'Failed to extract ZIP archive'
+    exit 1
+fi
+
+# Find and extract TAR archive
+TAR_FILE=$(find "$EXTRACT_DIR" -name '*.tar' -type f)
+if [ -z "$TAR_FILE" ]; then
+    echo 'TAR file not found'
+    exit 1
+fi
+
+tar -xf "$TAR_FILE" -C "$EXTRACT_DIR"
+if [ $? -ne 0 ]; then
+    echo 'Failed to extract TAR archive'
+    exit 1
+fi
+
+rm -f "$TAR_FILE"
+
+# Find and run installer
+INSTALLER=$(find "$EXTRACT_DIR" -type f -executable)
+if [ -z "$INSTALLER" ]; then
+    echo 'Installer not found'
+    exit 1
+fi
+
+"$INSTALLER"
+EXIT_CODE=$?
+
+# Cleanup
+rm -rf "$EXTRACT_DIR"
+exit $EXIT_CODE 

client/client_scripts/mac_installer.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+EXTRACT_DIR="$1"
+INSTALLER_PATH="$2"
+
+# Create and clean extract directory
+rm -rf "$EXTRACT_DIR"
+mkdir -p "$EXTRACT_DIR"
+
+# Mount the DMG
+MOUNT_POINT="$EXTRACT_DIR/mounted_dmg"
+hdiutil attach "$INSTALLER_PATH" -mountpoint "$MOUNT_POINT"
+if [ $? -ne 0 ]; then
+    echo "Failed to mount DMG"
+    exit 1
+fi
+
+# Check if the application exists in the mounted DMG
+if [ ! -d "$MOUNT_POINT/AmneziaVPN.app" ]; then
+    echo "Error: AmneziaVPN.app not found in the mounted DMG."
+    hdiutil detach "$MOUNT_POINT" #-quiet
+    exit 1
+fi
+
+# Run the application
+echo "Running AmneziaVPN.app from the mounted DMG..."
+open "$MOUNT_POINT/AmneziaVPN.app"
+
+# Get the PID of the app launched from the DMG
+APP_PATH="$MOUNT_POINT/AmneziaVPN.app"
+PID=$(pgrep -f "$APP_PATH")
+
+if [ -z "$PID" ]; then
+    echo "Failed to retrieve PID for AmneziaVPN.app"
+    hdiutil detach "$MOUNT_POINT"
+    exit 1
+fi
+
+# Wait for the specific PID to exit
+echo "Waiting for AmneziaVPN.app to exit..."
+while kill -0 "$PID" 2>/dev/null; do
+    sleep 1
+done
+
+# Unmount the DMG
+hdiutil detach "$EXTRACT_DIR/mounted_dmg"
+if [ $? -ne 0 ]; then
+    echo "Failed to unmount DMG"
+    exit 1
+fi
+
+# Optional: Remove the DMG file
+rm "$INSTALLER_PATH"
+
+echo "Installation completed successfully"
+exit 0 

client/core/scripts_registry.cpp

@@ -54,6 +54,15 @@ QString amnezia::scriptName(ProtocolScriptType type)
     }
 }
 
+QString amnezia::scriptName(ClientScriptType type)
+{
+    switch (type) {
+    case ClientScriptType::linux_installer: return QLatin1String("linux_installer.sh");
+    case ClientScriptType::mac_installer: return QLatin1String("mac_installer.sh");
+    default: return QString();
+    }
+}
+
 QString amnezia::scriptData(amnezia::SharedScriptType type)
 {
     QString fileName = QString(":/server_scripts/%1").arg(amnezia::scriptName(type));
@@ -81,3 +90,19 @@ QString amnezia::scriptData(amnezia::ProtocolScriptType type, DockerContainer co
     data.replace("\r", "");
     return data;
 }
+
+QString amnezia::scriptData(ClientScriptType type)
+{
+    QString fileName = QString(":/client_scripts/%1").arg(amnezia::scriptName(type));
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qDebug() << "Warning: script missing" << fileName;
+        return "";
+    }
+    QByteArray data = file.readAll();
+    if (data.isEmpty()) {
+        qDebug() << "Warning: script is empty" << fileName;
+    }
+    data.replace("\r", "");
+    return data;
+}

client/core/scripts_registry.h

@@ -1,44 +1,53 @@
 #ifndef SCRIPTS_REGISTRY_H
 #define SCRIPTS_REGISTRY_H
 
-#include <QLatin1String>
-#include "core/defs.h"
 #include "containers/containers_defs.h"
+#include "core/defs.h"
+#include <QLatin1String>
 
-namespace amnezia {
-
-enum SharedScriptType {
-    // General scripts
-    prepare_host,
-    install_docker,
-    build_container,
-    remove_container,
-    remove_all_containers,
-    setup_host_firewall,
-    check_connection,
-    check_server_is_busy,
-    check_user_in_sudo
-};
-enum ProtocolScriptType {
-    // Protocol scripts
-    dockerfile,
-    run_container,
-    configure_container,
-    container_startup,
-    openvpn_template,
-    wireguard_template,
-    awg_template,
-    xray_template
-};
-
-
-QString scriptFolder(DockerContainer container);
-
-QString scriptName(SharedScriptType type);
-QString scriptName(ProtocolScriptType type);
-
-QString scriptData(SharedScriptType type);
-QString scriptData(ProtocolScriptType type, DockerContainer container);
+namespace amnezia
+{
+
+    enum SharedScriptType {
+        // General scripts
+        prepare_host,
+        install_docker,
+        build_container,
+        remove_container,
+        remove_all_containers,
+        setup_host_firewall,
+        check_connection,
+        check_server_is_busy,
+        check_user_in_sudo
+    };
+
+    enum ProtocolScriptType {
+        // Protocol scripts
+        dockerfile,
+        run_container,
+        configure_container,
+        container_startup,
+        openvpn_template,
+        wireguard_template,
+        awg_template,
+        xray_template
+    };
+
+    enum ClientScriptType {
+        // Client-side scripts
+        linux_installer,
+        mac_installer
+    };
+
+    QString scriptFolder(DockerContainer container);
+
+    QString scriptName(SharedScriptType type);
+    QString scriptName(ProtocolScriptType type);
+    QString scriptName(ClientScriptType type);
+
+    QString scriptData(SharedScriptType type);
+    QString scriptData(ProtocolScriptType type, DockerContainer container);
+    QString scriptData(ClientScriptType type);
 }
 
 #endif // SCRIPTS_REGISTRY_H

client/resources.qrc

@@ -59,6 +59,9 @@
         <file>images/tray/active.png</file>
         <file>images/tray/default.png</file>
         <file>images/tray/error.png</file>
+        <file>client_scripts/linux_installer.sh</file>
+        <file>client_scripts/mac_installer.sh</file>
+        <file>server_scripts/openvpn_cloak/Dockerfile</file>
         <file>server_scripts/awg/configure_container.sh</file>
         <file>server_scripts/awg/Dockerfile</file>
         <file>server_scripts/awg/run_container.sh</file>
@@ -172,10 +175,11 @@
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
         <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
         <file>ui/qml/Controls2/WarningType.qml</file>
+        <file>ui/qml/Components/ChangelogDrawer.qml</file>
+        <file>ui/qml/Modules/Style/qmldir</file>
         <file>ui/qml/Filters/ContainersModelFilters.qml</file>
         <file>ui/qml/main2.qml</file>
         <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
-        <file>ui/qml/Modules/Style/qmldir</file>
         <file>ui/qml/Pages2/PageDeinstalling.qml</file>
         <file>ui/qml/Pages2/PageDevMenu.qml</file>
         <file>ui/qml/Pages2/PageHome.qml</file>

client/ui/controllers/pageController.h

@@ -137,6 +137,7 @@ public slots:
     void escapePressed();
     void closeTopDrawer();
 
+    void showChangelogDrawer();
 private:
     QSharedPointer<ServersModel> m_serversModel;
 

client/ui/controllers/systemController.h

@@ -9,7 +9,7 @@ class SystemController : public QObject
 {
     Q_OBJECT
 public:
-    explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
+    explicit SystemController(const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
 
     static void saveFile(const QString &fileName, const QString &data);
     static bool readFile(const QString &fileName, QByteArray &data);