AxScript upgrade

This commit is contained in:
Ralf
2025-12-17 23:36:00 +03:00
parent 0a3f5dcd3b
commit ffd69ae362
11 changed files with 313 additions and 516 deletions
@@ -4,6 +4,7 @@
#include <Client/AxScript/BridgeForm.h>
#include <Client/AxScript/BridgeEvent.h>
#include <Client/AxScript/BridgeMenu.h>
#include <main.h>
AxScriptEngine::AxScriptEngine(AxScriptManager* script_manager, const QString &name, QObject *parent) : QObject(parent), scriptManager(script_manager)
{
@@ -37,12 +38,13 @@ AxScriptEngine::~AxScriptEngine()
context.actions.clear();
context.objects.clear();
for (auto event : context.eventTimer) {
if (event.timer) {
event.timer->stop();
event.timer->deleteLater();
for (auto it = context.events.begin(); it != context.events.end(); ++it) {
if (it.value().timer) {
it.value().timer->stop();
it.value().timer->deleteLater();
}
}
context.events.clear();
bridgeApp.reset();
bridgeForm.reset();
@@ -76,84 +78,33 @@ void AxScriptEngine::registerEvent(const QString &type, const QJSValue &handler,
if (list_os.contains("linux")) os.insert(2);
if (list_os.contains("macos")) os.insert(3);
AxEvent event = {handler, timer, id, list_agents, list_listeners, os, jsEngine.get()};
QString eventKey = id.isEmpty() ? type + "_" + GenerateRandomString(8, "hex") : id;
AxEvent event = {handler, timer, eventKey, list_agents, list_listeners, os, jsEngine.get()};
event.event_id = eventKey;
if ( type == "FileBroserDisks") context.eventFileBroserDisks.append(event);
else if (type == "FileBroserList") context.eventFileBroserList.append(event);
else if (type == "FileBrowserUpload") context.eventFileBrowserUpload.append(event);
else if (type == "ProcessBrowserList") context.eventProcessBrowserList.append(event);
else if (type == "new_agent") context.eventNewAgent.append(event);
else if (type == "ready") context.eventReady.append(event);
else if (type == "disconnect") context.eventDisconnect.append(event);
else if (type == "timer") context.eventTimer.append(event);
context.events.insert(eventKey, event);
}
QList<AxEvent> AxScriptEngine::getEvents(const QString &type)
{
if ( type == "FileBroserDisks") return context.eventFileBroserDisks;
else if (type == "FileBroserList") return context.eventFileBroserList;
else if (type == "FileBrowserUpload") return context.eventFileBrowserUpload;
else if (type == "ProcessBrowserList") return context.eventProcessBrowserList;
else if (type == "new_agent") return context.eventNewAgent;
else if (type == "ready") return context.eventReady;
else if (type == "disconnect") return context.eventDisconnect;
else if (type == "timer") return context.eventTimer;
return QList<AxEvent>();
QList<AxEvent> result;
for (auto it = context.events.constBegin(); it != context.events.constEnd(); ++it) {
const QString& key = it.key();
if (key.startsWith(type + "_") || key == type ||
(type == "timer" && (key.startsWith("interval_") || key.startsWith("timeout_")))) {
result.append(it.value());
}
}
return result;
}
void AxScriptEngine::removeEvent(const QString &id)
{
for (int i=0; i< context.eventFileBroserDisks.size(); i++) {
if (id == context.eventFileBroserDisks[i].event_id) {
context.eventFileBroserDisks.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventFileBroserList.size(); i++) {
if (id == context.eventFileBroserList[i].event_id) {
context.eventFileBroserList.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventFileBrowserUpload.size(); i++) {
if (id == context.eventFileBrowserUpload[i].event_id) {
context.eventFileBrowserUpload.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventProcessBrowserList.size(); i++) {
if (id == context.eventProcessBrowserList[i].event_id) {
context.eventProcessBrowserList.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventNewAgent.size(); i++) {
if (id == context.eventNewAgent[i].event_id) {
context.eventNewAgent.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventReady.size(); i++) {
if (id == context.eventReady[i].event_id) {
context.eventReady.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventDisconnect.size(); i++) {
if (id == context.eventDisconnect[i].event_id) {
context.eventDisconnect.removeAt(i);
i--;
}
}
for (int i=0; i< context.eventTimer.size(); i++) {
if (id == context.eventTimer[i].event_id) {
auto event = context.eventTimer.takeAt(i);
if (context.events.contains(id)) {
AxEvent event = context.events.take(id);
if (event.timer) {
event.timer->stop();
event.timer->deleteLater();
i--;
}
}
}
@@ -161,42 +112,13 @@ void AxScriptEngine::removeEvent(const QString &id)
QStringList AxScriptEngine::listEvent()
{
QStringList list;
for (int i=0; i< context.eventFileBroserDisks.size(); i++) {
if (context.eventFileBroserDisks[i].event_id != "")
list.append(context.eventFileBroserDisks[i].event_id);
}
for (int i=0; i< context.eventFileBroserList.size(); i++) {
if (context.eventFileBroserList[i].event_id != "")
list.append(context.eventFileBroserList[i].event_id);
}
for (int i=0; i< context.eventFileBrowserUpload.size(); i++) {
if (context.eventFileBrowserUpload[i].event_id != "")
list.append(context.eventFileBrowserUpload[i].event_id);
}
for (int i=0; i< context.eventProcessBrowserList.size(); i++) {
if (context.eventProcessBrowserList[i].event_id != "")
list.append(context.eventProcessBrowserList[i].event_id);
}
for (int i=0; i< context.eventNewAgent.size(); i++) {
if (context.eventNewAgent[i].event_id != "")
list.append(context.eventNewAgent[i].event_id);
}
for (int i=0; i< context.eventReady.size(); i++) {
if (context.eventReady[i].event_id != "")
list.append(context.eventReady[i].event_id);
}
for (int i=0; i< context.eventDisconnect.size(); i++) {
if (context.eventDisconnect[i].event_id != "")
list.append(context.eventDisconnect[i].event_id);
}
for (int i=0; i< context.eventTimer.size(); i++) {
if (context.eventTimer[i].event_id != "")
list.append(context.eventTimer[i].event_id);
for (auto it = context.events.constBegin(); it != context.events.constEnd(); ++it) {
if (!it.key().isEmpty())
list.append(it.key());
}
return list;
}
/////
void AxScriptEngine::registerMenu(const QString &type, AbstractAxMenuItem *menu, const QSet<QString> &list_agents, const QSet<QString> &list_os, const QSet<QString> &list_listeners)
@@ -206,42 +128,13 @@ void AxScriptEngine::registerMenu(const QString &type, AbstractAxMenuItem *menu,
if (list_os.contains("linux")) os.insert(2);
if (list_os.contains("macos")) os.insert(3);
AxMenuItem item = {menu, list_agents, list_listeners, os};
if ( type == "SessionMain") context.menuSessionMain.append(item);
else if (type == "SessionAgent") context.menuSessionAgent.append(item);
else if (type == "SessionBrowser") context.menuSessionBrowser.append(item);
else if (type == "SessionAccess") context.menuSessionAccess.append(item);
else if (type == "FileBrowser") context.menuFileBrowser.append(item);
else if (type == "ProcessBrowser") context.menuProcessBrowser.append(item);
else if (type == "DownloadRunning") context.menuDownloadRunning.append(item);
else if (type == "DownloadFinished") context.menuDownloadFinished.append(item);
else if (type == "Tasks") context.menuTasks.append(item);
else if (type == "TasksJob") context.menuTasksJob.append(item);
else if (type == "TargetsTop") context.menuTargetsTop.append(item);
else if (type == "TargetsBottom") context.menuTargetsBottom.append(item);
else if (type == "TargetsCenter") context.menuTargetsCenter.append(item);
else if (type == "Creds") context.menuCreds.append(item);
AxMenuItem item = {menu, list_agents, list_listeners, os};
context.menus[type].append(item);
}
QList<AxMenuItem> AxScriptEngine::getMenuItems(const QString &type)
{
if ( type == "SessionMain") return context.menuSessionMain;
else if (type == "SessionAgent") return context.menuSessionAgent;
else if (type == "SessionBrowser") return context.menuSessionBrowser;
else if (type == "SessionAccess") return context.menuSessionAccess;
else if (type == "FileBrowser") return context.menuFileBrowser;
else if (type == "ProcessBrowser") return context.menuProcessBrowser;
else if (type == "DownloadRunning") return context.menuDownloadRunning;
else if (type == "DownloadFinished") return context.menuDownloadFinished;
else if (type == "Tasks") return context.menuTasks;
else if (type == "TasksJob") return context.menuTasksJob;
else if (type == "TargetsTop") return context.menuTargetsTop;
else if (type == "TargetsBottom") return context.menuTargetsBottom;
else if (type == "TargetsCenter") return context.menuTargetsCenter;
else if (type == "Creds") return context.menuCreds;
return QList<AxMenuItem>();
return context.menus.value(type);
}
void AxScriptEngine::engineError(const QString &message) { engine()->throwError(QJSValue::TypeError, message); }