redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 11:47:46 +00:00
Code Activity

Communicate to nativelauncher through IPC

Browse source 
This makes Dalamud launching under Wine scenarios (such as on Linux or
macOS) much more stable, as it's no longer sifting through stdout
output.

This requires nativelauncher >=v1.1.0, and the update functionality will
 come in a later commit.
This commit is contained in:
Joshua Goins 2022-04-06 13:18:40 -04:00
parent d39aa8d5aa
commit dbbcb67134
1 changed files with 53 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/launchercore.cpp
View file

@ -18,6 +18,7 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QRegularExpressionMatch> #include <QRegularExpressionMatch>
#include <algorithm> #include <algorithm>
#include <QTcpServer>
#include "launchercore.h" #include "launchercore.h"
#include "sapphirelauncher.h" #include "sapphirelauncher.h"
@ -63,6 +64,7 @@ void LauncherCore::launchGame(const ProfileSettings& profile, const LoginAuth au
if(profile.dalamud.enabled) { if(profile.dalamud.enabled) {
arguments.push_back(dataDir + "/NativeLauncher.exe"); arguments.push_back(dataDir + "/NativeLauncher.exe");
arguments.push_back("5248"); // TODO: make port configurable/random
} }
// now for the actual game... // now for the actual game...
@ -112,52 +114,7 @@ void LauncherCore::launchGame(const ProfileSettings& profile, const LoginAuth au
gameProcess->setProcessEnvironment(env); gameProcess->setProcessEnvironment(env);
gameProcess->setProcessChannelMode(QProcess::MergedChannels); gameProcess->setProcessChannelMode(QProcess::ForwardedChannels);
if(profile.dalamud.enabled) {
connect(gameProcess, &QProcess::readyReadStandardOutput, [this, gameProcess, profile] {
QString output = gameProcess->readAllStandardOutput();
bool success;
int dec = output.toInt(&success, 10);
if(!success)
return;
qDebug() << "got output: " << output;
qDebug() << "Now launching dalamud...";
QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
dataDir = "Z:" + dataDir.replace('/', '\\');
QJsonObject startInfo;
startInfo["WorkingDirectory"] = dataDir;
startInfo["ConfigurationPath"] = dataDir + "\\dalamudConfig.json";
startInfo["PluginDirectory"] = dataDir + "\\installedPlugins";
startInfo["AssetDirectory"] = dataDir + "\\DalamudAssets";
startInfo["DefaultPluginDirectory"] = dataDir + "\\devPlugins";
startInfo["DelayInitializeMs"] = 0;
startInfo["GameVersion"] = profile.gameVersion;
startInfo["Language"] = profile.language;
startInfo["OptOutMbCollection"] = profile.dalamud.optOutOfMbCollection;
QString argsEncoded = QJsonDocument(startInfo).toJson().toBase64();
auto dalamudProcess = new QProcess();
dalamudProcess->setProcessChannelMode(QProcess::ForwardedChannels);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("DALAMUD_RUNTIME", dataDir + "\\DalamudRuntime");
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
env.insert("XL_WINEONLINUX", "true");
#endif
dalamudProcess->setProcessEnvironment(env);
auto list = dalamudProcess->processEnvironment().toStringList();
launchExecutable(profile, dalamudProcess, {dataDir + "/Dalamud/" + "Dalamud.Injector.exe", output, argsEncoded});
});
}
const QString argFormat = profile.encryptArguments ? " /%1 =%2" : " %1=%2"; const QString argFormat = profile.encryptArguments ? " /%1 =%2" : " %1=%2";
@ -172,10 +129,57 @@ void LauncherCore::launchGame(const ProfileSettings& profile, const LoginAuth au
arguments.append(argJoined); arguments.append(argJoined);
} }
connect(gameProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), if(profile.dalamud.enabled) {
[=](int exitCode, QProcess::ExitStatus exitStatus){ auto socket = new QTcpServer();
gameClosed();
connect(socket, &QTcpServer::newConnection, [this, profile, socket] {
auto connection = socket->nextPendingConnection();
connect(connection, &QTcpSocket::readyRead, [this, connection, profile, socket] {
QString output = connection->readAll();
bool success;
int exitCode = output.toInt(&success, 10);
if(exitCode != -1 && success) {
QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
dataDir = "Z:" + dataDir.replace('/', '\\');
QJsonObject startInfo;
startInfo["WorkingDirectory"] = dataDir;
startInfo["ConfigurationPath"] = dataDir + "\\dalamudConfig.json";
startInfo["PluginDirectory"] = dataDir + "\\installedPlugins";
startInfo["AssetDirectory"] = dataDir + "\\DalamudAssets";
startInfo["DefaultPluginDirectory"] = dataDir + "\\devPlugins";
startInfo["DelayInitializeMs"] = 0;
startInfo["GameVersion"] = profile.gameVersion;
startInfo["Language"] = profile.language;
startInfo["OptOutMbCollection"] = profile.dalamud.optOutOfMbCollection;
QString argsEncoded = QJsonDocument(startInfo).toJson().toBase64();
auto dalamudProcess = new QProcess();
dalamudProcess->setProcessChannelMode(QProcess::ForwardedChannels);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("DALAMUD_RUNTIME", dataDir + "\\DalamudRuntime");
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
env.insert("XL_WINEONLINUX", "true");
#endif
dalamudProcess->setProcessEnvironment(env);
auto list = dalamudProcess->processEnvironment().toStringList();
launchExecutable(profile, dalamudProcess, {dataDir + "/Dalamud/" + "Dalamud.Injector.exe", QString::number(exitCode), argsEncoded});
connection->close();
socket->close();
}
}); });
});
socket->listen(QHostAddress::Any, 5248);
}
launchGameExecutable(profile, gameProcess, arguments); launchGameExecutable(profile, gameProcess, arguments);