[*] Executing the script after joining the server or after disconnecting from...

[*] Executing the script after joining the server or after disconnecting from the server for CLI client

vpn/client/DapCmdHandlers/DapCmdConnect.cpp

@@ -71,7 +71,9 @@ void DapCmdConnect::handle(const QJsonObject* params)
     QMap<QString, QJsonValue> mandatoryConnParams = {
         {ADDRESS_KEY, params->value(ADDRESS_KEY)},
         {PORT_KEY, params->value(PORT_KEY)},
-        {UPDATE_ROUTE_TABLE, params->value(UPDATE_ROUTE_TABLE)}
+        {UPDATE_ROUTE_TABLE, params->value(UPDATE_ROUTE_TABLE)},
+        {RUN_SCRIPT_PATH, params->value(RUN_SCRIPT_PATH)},
+        {RUN_SCRIPT_AFTER_CONNECT, params->value(RUN_SCRIPT_AFTER_CONNECT)}
     };
 
     if (!mandatoryConnParams[ADDRESS_KEY].isString() || !mandatoryConnParams[PORT_KEY].isDouble()) {
@@ -93,6 +95,13 @@ void DapCmdConnect::handle(const QJsonObject* params)
     uint16_t port = uint16_t(mandatoryConnParams[PORT_KEY].toInt());
     QString address = mandatoryConnParams[ADDRESS_KEY].toString();
 
+    QString runScriptPath = mandatoryConnParams[RUN_SCRIPT_PATH].toString();
+
+    if (!runScriptPath.isEmpty()){
+        bool runAfterConnect = mandatoryConnParams[RUN_SCRIPT_AFTER_CONNECT].toBool(true);
+        emit sigSetRunScript(runScriptPath, runAfterConnect);
+    }
+
     qDebug() << "Address:" << address << ", Port:" << port << ", UpdateRouteTable:" << updateRouteTable;
     qDebug() << "SerialKey:" << (serialKey.isEmpty() ? "No serial key provided" : "Serial key provided");
 

vpn/client/DapCmdHandlers/DapCmdConnect.h

@@ -24,6 +24,7 @@ signals:
     void sigConnectNoAuth(const QString& address, uint16_t port);
     void sigDisconnect();
     void sigRestartService(bool if_runnning);
+    void sigSetRunScript(const QString& runScriptPath, bool runAfterConnect);
 
 private:
     const QString ACTION_KEY = "action";
@@ -33,6 +34,8 @@ private:
     const QString ADDRESS_KEY = "address";
     const QString PORT_KEY = "port";
     const QString UPDATE_ROUTE_TABLE = "updateRouteTable";
+    const QString RUN_SCRIPT_PATH = "run_script_path";
+    const QString RUN_SCRIPT_AFTER_CONNECT = "run_script_after_connect";
 
     const QString CODE_KEY = "code";
     const QString MESSAGE_KEY = "message";

vpn/qml/handlers/DapCmdConnect.cpp

@@ -7,7 +7,8 @@ DapCmdConnect::DapCmdConnect(QObject *parent)
 }
 
 void DapCmdConnect::sendCmdConnect(const QString& a_addr, quint16 a_port,
-                                   const QString& a_user, const QString& a_pswd,  const QString& a_serial, const bool a_updateRouteTable)
+                                   const QString& a_user, const QString& a_pswd,  const QString& a_serial, const bool a_updateRouteTable,
+                                   const QString& a_runScriptPath, const bool a_runAfterConnect)
 {
     QJsonObject obj;
     obj["action"] = "Connect";
@@ -20,7 +21,10 @@ void DapCmdConnect::sendCmdConnect(const QString& a_addr, quint16 a_port,
         obj["password"] = a_pswd;
     if ( !a_serial.isEmpty() )
         obj["serial"] = QString(a_serial).remove('-');
-    obj["port"] = a_port;
+    if ( !a_runScriptPath.isEmpty() ) {
+        obj["run_script_path"] = QString(a_runScriptPath);
+        obj["run_script_after_connect"] = a_runAfterConnect;
+    }
 
     sendCmd(&obj);
 }

vpn/qml/handlers/DapCmdConnect.h

@@ -11,8 +11,9 @@ public:
     explicit DapCmdConnect(QObject *parent = nullptr);
 
 public slots:
-    void sendCmdConnect(const QString& a_addr, quint16 a_port,
-                        const QString& a_user= QString(), const QString& a_pswd = QString(),  const QString& a_serial= QString(), const bool a_updateRouteTable = true);
+    void sendCmdConnect(const QString& a_addr, quint16 a_port, const QString& a_user = QString(), const QString& a_pswd = QString(),
+                        const QString& a_serial = QString(), const bool a_updateRouteTable = true,
+                        const QString& a_runScriptPath = QString(), const bool a_runAfterConnect = false);
     void sendCmdConnectByOrder(const QString& a_addr);