Make XRay port changable

temporarily disabled the running service check

client/core/controllers/serverController.cpp

@@ -569,6 +569,7 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
 
     // Xray vars
     vars.append({ { "$XRAY_SITE_NAME", xrayConfig.value(config_key::site).toString(protocols::xray::defaultSite) } });
+    vars.append({ { "$XRAY_SERVER_PORT", xrayConfig.value(config_key::port).toString(protocols::xray::defaultPort) } });
 
     // Wireguard vars
     vars.append({ { "$WIREGUARD_SUBNET_IP",

client/protocols/protocols_defs.cpp

@@ -159,6 +159,7 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::Dns: return false;
     case Proto::Sftp: return true;
     case Proto::Socks5Proxy: return true;
+    case Proto::Xray: return true;
     default: return false;
     }
 }

client/server_scripts/xray/configure_container.sh

@@ -29,7 +29,7 @@ cat > /opt/amnezia/xray/server.json <<EOF
     },
     "inbounds": [
         {
-            "port": 443,
+            "port": "$XRAY_SERVER_PORT",
             "protocol": "vless",
             "settings": {
                 "clients": [
@@ -44,7 +44,7 @@ cat > /opt/amnezia/xray/server.json <<EOF
                 "network": "tcp",
                 "security": "reality",
                 "realitySettings": {
-                    "dest": "$XRAY_SITE_NAME:443",
+                    "dest": "$XRAY_SITE_NAME:$XRAY_SERVER_PORT",
                     "serverNames": [
                         "$XRAY_SITE_NAME"
                     ],

client/server_scripts/xray/run_container.sh

@@ -4,7 +4,7 @@ sudo docker run -d \
 --log-driver none \
 --restart always \
 --cap-add=NET_ADMIN \
--p 443:443/tcp \
+-p $XRAY_SERVER_PORT:$XRAY_SERVER_PORT/tcp \
 --name $CONTAINER_NAME $CONTAINER_NAME
 
 sudo docker network connect amnezia-dns-net $CONTAINER_NAME

client/server_scripts/xray/template.json

@@ -19,7 +19,7 @@
                 "vnext": [
                     {
                         "address": "$SERVER_IP_ADDRESS",
-                        "port": 443,
+                        "port": "$XRAY_SERVER_PORT",
                         "users": [
                             {
                                 "id": "$XRAY_CLIENT_ID",

client/ui/controllers/connectionController.cpp

@@ -36,13 +36,13 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
 
 void ConnectionController::openConnection()
 {
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    if (!Utils::processIsRunning(Utils::executable(SERVICE_NAME, false), true))
-    {
-        emit connectionErrorOccurred(ErrorCode::AmneziaServiceNotRunning);
-        return;
-    }
-#endif
+// #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+//     if (!Utils::processIsRunning(Utils::executable(SERVICE_NAME, false), true))
+//     {
+//         emit connectionErrorOccurred(ErrorCode::AmneziaServiceNotRunning);
+//         return;
+//     }
+// #endif
 
     int serverIndex = m_serversModel->getDefaultServerIndex();
     QJsonObject serverConfig = m_serversModel->getServerConfig(serverIndex);