mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
be692001b0
- Added local proxy restart token management in Settings. - Implemented logic to handle local proxy state on application quit. - Updated ProxyServer to restart based on configuration changes. - Enhanced API configuration updates to bump restart token when necessary. - Improved UI components to reflect local proxy availability and state. - Added new error handling and notifications for local proxy operations.
111 lines
2.8 KiB
C++
111 lines
2.8 KiB
C++
#include "proxyserver.h"
|
|
#include "settings.h"
|
|
|
|
#include <QDebug>
|
|
|
|
ProxyServer::ProxyServer(const std::shared_ptr<Settings> &settings, QObject *parent)
|
|
: QObject(parent)
|
|
, m_settings(settings)
|
|
, m_service(new ProxyService(settings, this))
|
|
{
|
|
m_lastRestartToken = m_settings ? m_settings->localProxyRestartToken() : 0;
|
|
}
|
|
|
|
ProxyServer::~ProxyServer()
|
|
{
|
|
stop();
|
|
}
|
|
|
|
bool ProxyServer::start(quint16 port)
|
|
{
|
|
if (m_isRunning) {
|
|
if (m_currentApiPort == port) {
|
|
qInfo() << "Local proxy: already running on port" << port;
|
|
return true;
|
|
}
|
|
|
|
qInfo() << "Local proxy: restarting on new port" << port;
|
|
stop();
|
|
}
|
|
|
|
m_api.reset(new HttpApi(m_service.toWeakRef()));
|
|
const bool apiStarted = m_api->start(port);
|
|
if (!apiStarted) {
|
|
qWarning() << "Local proxy: port is busy:" << port;
|
|
m_api.reset();
|
|
m_isRunning = false;
|
|
m_currentApiPort = 0;
|
|
return false;
|
|
}
|
|
|
|
m_isRunning = true;
|
|
m_currentApiPort = port;
|
|
|
|
return true;
|
|
}
|
|
|
|
void ProxyServer::stop()
|
|
{
|
|
stopXrayProcess();
|
|
if (m_api) {
|
|
m_api->stop();
|
|
m_api.reset();
|
|
}
|
|
m_isRunning = false;
|
|
m_currentApiPort = 0;
|
|
m_currentProxyPort = 0;
|
|
}
|
|
|
|
bool ProxyServer::startXrayProcess()
|
|
{
|
|
return m_service->startXray();
|
|
}
|
|
|
|
void ProxyServer::stopXrayProcess()
|
|
{
|
|
m_service->stopXray();
|
|
}
|
|
|
|
bool ProxyServer::syncSettings()
|
|
{
|
|
if (!m_isRunning) {
|
|
qDebug() << "Local proxy: syncSettings called but server is not running";
|
|
return false;
|
|
}
|
|
|
|
const quint16 newProxyPort = m_settings ? m_settings->localProxyPort() : 0;
|
|
const int restartToken = m_settings ? m_settings->localProxyRestartToken() : 0;
|
|
const bool xrayRunning = m_service->isXrayRunning();
|
|
|
|
if (!xrayRunning) {
|
|
qInfo() << "Local proxy: starting Xray on port" << newProxyPort;
|
|
const bool started = startXrayProcess();
|
|
if (started) {
|
|
m_currentProxyPort = newProxyPort;
|
|
m_lastRestartToken = restartToken;
|
|
}
|
|
return started;
|
|
}
|
|
|
|
if (m_lastRestartToken != restartToken) {
|
|
qInfo() << "Local proxy: restarting Xray due to config change token";
|
|
const bool restarted = m_service->restartXray();
|
|
if (restarted) {
|
|
m_currentProxyPort = newProxyPort;
|
|
m_lastRestartToken = restartToken;
|
|
}
|
|
return restarted;
|
|
}
|
|
|
|
if (m_currentProxyPort != newProxyPort) {
|
|
qInfo() << "Local proxy: proxy port changed from" << m_currentProxyPort << "to" << newProxyPort;
|
|
const bool restarted = m_service->restartXray();
|
|
if (restarted) {
|
|
m_currentProxyPort = newProxyPort;
|
|
m_lastRestartToken = restartToken;
|
|
}
|
|
return restarted;
|
|
}
|
|
|
|
return true;
|
|
} |