Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: restart profile after core crash

Browse Source
This commit is contained in:
arm64v8a
2022-10-18 17:15:49 +08:00
parent b46cd2da3d
commit 2e991b675d
6 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/sing-box-vpn.json
View File

@@ -55,6 +55,15 @@
"ff00::/8"
],
"outbound": "block"
},
{
"process_name": [
"nekoray_core",
"nekoray_core.exe",
"nekobox_core",
"nekobox_core.exe"
],
"outbound": "direct"
}
%PROCESS_NAME_RULE%
%CIDR_RULE%

11
main/NekoRay_Utils.cpp
View File

@@ -107,3 +107,14 @@ void runOnUiThread(const std::function<void()> &callback, QObject *parent) {
void runOnNewThread(const std::function<void()> &callback) {
createQThread(callback)->start();
}
void setTimeout(const std::function<void()> &callback, QObject *obj, int timeout) {
auto t = new QTimer;
QObject::connect(t, &QTimer::timeout, obj, [=] {
callback();
t->deleteLater();
});
t->setSingleShot(true);
t->setInterval(timeout);
t->start();
}

2
main/NekoRay_Utils.hpp
View File

@@ -198,3 +198,5 @@ inline void connectOnce(EMITTER *emitter, SIGNAL signal, RECEIVER *receiver, Rec
*connection = QObject::connect(emitter, signal, receiver, onTriggered, connectionType);
}
void setTimeout(const std::function<void()> &callback, QObject *obj, int timeout = 0);

17
sys/ExternalProcess.cpp
View File

@@ -90,19 +90,22 @@ namespace NekoRay::sys {
if (!dataStore->core_prepare_exit && state == QProcess::NotRunning) {
if (failed_to_start) return; // no retry
restart_id = NekoRay::dataStore->started_id;
dialog_message("ExternalProcess", "Crashed");
showLog("[Error] core exited, restarting.\n");
// Restart
auto t = new QTimer;
connect(t, &QTimer::timeout, this, [=] {
setTimeout([=] {
Kill();
ExternalProcess::started = false;
Start();
t->deleteLater();
});
t->setSingleShot(true);
t->setInterval(1000);
t->start();
}, this, 1000);
} else if (state == QProcess::Running && restart_id >= 0) {
// Restart profile
setTimeout([=] {
dialog_message("ExternalProcess", "CoreRestarted," + Int2String(restart_id));
restart_id = -1;
}, this, 1000);
}
});
}

1
sys/ExternalProcess.hpp
View File

@@ -38,6 +38,7 @@ namespace NekoRay::sys {
private:
bool show_stderr = false;
bool failed_to_start = false;
int restart_id = -1;
};
// start & kill change this list

2
ui/mainwindow.cpp
View File

@@ -481,6 +481,8 @@ void MainWindow::dialog_message_impl(const QString &sender, const QString &info)
} else if (sender == "ExternalProcess") {
if (info == "Crashed") {
neko_stop();
} else if (info.startsWith("CoreRestarted")) {
neko_start(info.split(",")[1].toInt());
}
}
}