zedcode/bs-manager
1
0
Fork 0
mirror of https://github.com/Zagrios/bs-manager.git synced 2026-07-03 14:08:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix-627] support host calls for flatpak with spawn/exec

Browse Source 
* created wrapper calls for spawn and exec for all os support
* refactored names for isProcessRunning, getProcessId, and isSteamRunning
This commit is contained in:
silentrald
2024-11-21 00:48:31 +08:00
parent 8096b3ec76
commit 38ea360ee6
12 changed files with 214 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/services/linux.service.ts
+11 -44
View File
@@ -1,7 +1,6 @@
import fs from "fs-extra";
import log from "electron-log";
import path from "path";
import { SpawnOptionsWithoutStdio, spawn } from "child_process";
import { BS_APP_ID, PROTON_BINARY_PREFIX, WINE_BINARY_PREFIX } from "main/constants";
import { StaticConfigurationService } from "./static-configuration.service";
import { CustomError } from "shared/models/exceptions/custom-error.class";
@@ -19,8 +18,7 @@ export class LinuxService {
}
private readonly staticConfig: StaticConfigurationService;
public readonly isFlatpak = process.env.container === "flatpak";
private protonCommand = "";
private constructor() {
this.staticConfig = StaticConfigurationService.getInstance();
@@ -55,13 +53,17 @@ export class LinuxService {
BSLaunchError.PROTON_NOT_SET
);
}
const protonPath = path.join(this.staticConfig.get("proton-folder"), PROTON_BINARY_PREFIX);
const protonPath = path.join(
this.staticConfig.get("proton-folder"),
PROTON_BINARY_PREFIX
);
if (!fs.pathExistsSync(protonPath)) {
throw CustomError.fromError(
new Error("Could not locate proton binary"),
BSLaunchError.PROTON_NOT_FOUND
);
}
this.protonCommand = `"${protonPath}" run`;
// Setup Proton environment variables
Object.assign(env, {
@@ -78,22 +80,6 @@ export class LinuxService {
});
}
public spawnBsProcess(bsExePath: string, args: string[], spawnOptions: SpawnOptionsWithoutStdio) {
// Already checked in setupLaunch
const protonPath = path.join(this.staticConfig.get("proton-folder"), PROTON_BINARY_PREFIX);
// "/bin/sh" does not see flatpak-spawn
// Most Debian and Arch should also support "/bin/bash"
spawnOptions.shell = "/bin/bash";
const command = this.isFlatpak
? this.createFlatpakCommand(protonPath, bsExePath, args, spawnOptions)
: `"${protonPath}" run "${bsExePath}" ${args.join(" ")}`;
log.info("Linux launch BS command\n>", command);
return spawn(command, spawnOptions);
}
public verifyProtonPath(protonFolder: string = ""): boolean {
if (protonFolder === "") {
if (!this.staticConfig.has("proton-folder")) {
@@ -124,32 +110,13 @@ export class LinuxService {
return winePath;
}
// === Flatpak Specific === //
private createFlatpakCommand(protonPath: string, bsExePath: string, args: string[], spawnOptions: SpawnOptionsWithoutStdio): string {
// DON'T REMOVE: Good for injecting commands while debugging with flatpak
// return args.slice(1).join(" ");
// The env vars are hidden to flatpak-spawn, need to set them manually in --env arg
// Minimal copy of the env, don't need to copy them all
const envArgs = [
"SteamAppId",
"SteamOverlayGameId",
"SteamGameId",
"WINEDLLOVERRIDES",
"STEAM_COMPAT_DATA_PATH",
"STEAM_COMPAT_INSTALL_PATH",
"STEAM_COMPAT_CLIENT_INSTALL_PATH",
"STEAM_COMPAT_APP_ID",
"SteamEnv",
].map(envName => {
return `--env=${envName}="${spawnOptions.env[envName]}"`;
}).join(" ");
return `flatpak-spawn --host ${envArgs} "${protonPath}" run "${bsExePath}" ${args.join(" ")}`;
public getProtonCommand(): string {
// Set in setupLaunch
return this.protonCommand;
}
// === Flatpak Specific === //
public getFlatpakLocalVersionFolder(): string {
return path.join(
app.getPath("home"),