[feat] inject env vars to launch options with steam format %command%

Zagrios · Jan 20, 2025 · af28909 · af28909
1 parent 3046519
commit af28909
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json
@@ -28,6 +28,11 @@
         "pin": "Pin",
         "unpin": "Unpin"
     },
+    "generic": {
+        "env": {
+            "parse": "Could not properly parse the enviroment variables passed in the launch options."
+        }
+    },
     "title-bar": {
         "outdated": "outdated"
     },

diff --git a/src/main/helpers/env.helpers.ts b/src/main/helpers/env.helpers.ts
@@ -107,7 +107,7 @@ export function parseEnvString(envString: string): Record<string, string> {
         if (state === EnvParserState.ERROR) {
             throw new CustomError(
                 `parseEnvString failed: invalid character at position ${pos}`,
-                "env.parse"
+                "generic.env.parse"
             );
         }
     }
@@ -123,6 +123,6 @@ export function parseEnvString(envString: string): Record<string, string> {
 
     throw new CustomError(
         "parseEnvString failed: invalid ending state",
-        "env.parse"
+        "generic.env.parse"
     );
 }
diff --git a/src/main/services/linux.service.ts b/src/main/services/linux.service.ts
@@ -10,6 +10,7 @@ import { BsmShellLog, bsmExec } from "main/helpers/os.helpers";
 import { LaunchMods } from "shared/models/bs-launch/launch-option.interface";
 import { SteamShortcutData } from "shared/models/steam/shortcut.model";
 import { buildBsLaunchArgs } from "./bs-launcher/abstract-launcher.service";
+import { parseEnvString } from "main/helpers/env.helpers";
 
 export class LinuxService {
     private static instance: LinuxService;
@@ -24,6 +25,7 @@ export class LinuxService {
     private readonly installLocationService: InstallationLocationService;
     private readonly staticConfig: StaticConfigurationService;
 
+    private readonly COMMAND_FORMAT = "%command%";
     private nixOS: boolean | undefined;
 
     private constructor() {
@@ -112,6 +114,24 @@ export class LinuxService {
             envVars.PROTON_LOG_DIR = path.join(bsFolderPath, "Logs");
         }
 
+        if (launchOptions.additionalArgs) {
+            const additionalArgs = launchOptions.additionalArgs.join(" ");
+            const index = additionalArgs.indexOf(this.COMMAND_FORMAT);
+            if (index > -1) {
+                const envString = additionalArgs.substring(0, index);
+                log.info("Parsing env string ", `"${envString}"`)
+                for (const [ key, value ] of Object.entries(parseEnvString(envString))) {
+                    if (key in envVars) {
+                        log.warn("Ignoring", `${key}=${value}`, "already set env launch command");
+                    } else {
+                        log.info("Injecting", `${key}="${value}"`, "to the env launch command");
+                    }
+                }
+            }
+
+            launchOptions.additionalArgs = [ additionalArgs.substring(index + this.COMMAND_FORMAT.length) ];
+        }
+
         return envVars;
     }
 

diff --git a/src/renderer/services/bs-launcher.service.ts b/src/renderer/services/bs-launcher.service.ts
@@ -61,7 +61,12 @@ export class BSLauncherService {
                 this.notificationService.notifySuccess({title: `notifications.bs-launch.success.titles.${event.type}`, desc: `notifications.bs-launch.success.msg.${event.type}`});
             },
             error: (err: CustomError) => {
-                if(!err?.code || !Object.values(BSLaunchError).includes(err.code as BSLaunchError)){
+                if (err?.code?.startsWith("generic.")) {
+                    this.notificationService.notifyError({
+                        title: "notifications.bs-launch.errors.titles.UNKNOWN_ERROR",
+                        desc: err.code,
+                    });
+                } else if(!err?.code || !Object.values(BSLaunchError).includes(err.code as BSLaunchError)){
                     this.notificationService.notifyError({title: "notifications.bs-launch.errors.titles.UNKNOWN_ERROR", desc: "notifications.bs-launch.errors.msg.UNKNOWN_ERROR"});
                 } else {
                     this.notificationService.notifyError({title: `notifications.bs-launch.errors.titles.${err.code}`, desc: `notifications.bs-launch.errors.msg.${err.code}`, duration: sToMs(9)})