[FIX] Switch to sniper runtime (#2792)

* [FIX] Switch to sniper runtime * fall back to soldier runtime (if sniper not found) * read vdf file to determine runtime * fix remaining issues * Update launcher.ts * Update launcher.ts * Update src/backend/launcher.ts Co-authored-by: Mathis Dröge <[email protected]> * Update src/backend/launcher.ts Co-authored-by: Mathis Dröge <[email protected]> * Update src/backend/utils.ts Co-authored-by: Mathis Dröge <[email protected]> * Update src/backend/launcher.ts Co-authored-by: Paweł Lidwin <[email protected]> * Update launcher.ts * Update launcher.ts --------- Co-authored-by: Mathis Dröge <[email protected]> Co-authored-by: Paweł Lidwin <[email protected]>
Heroic-Games-Launcher · Jul 24, 2023 · f83d036 · f83d036
1 parent adf275c
commit f83d036
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts
@@ -7,7 +7,7 @@ import {
   appendFileSync,
   writeFileSync
 } from 'graceful-fs'
-import { join } from 'path'
+import { join, normalize } from 'path'
 
 import {
   defaultWinePrefix,
@@ -51,14 +51,17 @@ import {
   LaunchPreperationResult,
   RpcClient,
   WineInstallation,
-  WineCommandArgs
+  WineCommandArgs,
+  SteamRuntime
 } from 'common/types'
 import { spawn } from 'child_process'
 import shlex from 'shlex'
 import { isOnline } from './online_monitor'
 import { showDialogBoxModalAuto } from './dialog/dialog'
 import { setupUbisoftConnect } from './storeManagers/legendary/setup'
 import { gameManagerMap } from 'backend/storeManagers'
+import * as VDF from '@node-steam/vdf'
+import { readFileSync } from 'fs'
 
 async function prepareLaunch(
   gameSettings: GameSettings,
@@ -121,16 +124,36 @@ async function prepareLaunch(
     gameSettings.useSteamRuntime &&
     (isNative || gameSettings.wineVersion.type === 'proton')
   if (shouldUseRuntime) {
+    // Determine which runtime to use based on toolmanifest.vdf which is shipped with proton
+    let nonNativeRuntime: SteamRuntime['type'] = 'soldier'
+    if (!isNative) {
+      try {
+        const parentPath = normalize(join(gameSettings.wineVersion.bin, '..'))
+        const requiredAppId = VDF.parse(
+          readFileSync(join(parentPath, 'toolmanifest.vdf'), 'utf-8')
+        ).manifest?.require_tool_appid
+        if (requiredAppId === 1628350) nonNativeRuntime = 'sniper'
+      } catch (error) {
+        logError(
+          ['Failed to parse toolmanifest.vdf:', error],
+          LogPrefix.Backend
+        )
+      }
+    }
     // for native games lets use scout for now
-    const runtimeType = isNative ? 'scout' : 'soldier'
+    const runtimeType = isNative ? 'scout' : nonNativeRuntime
     const { path, args } = await getSteamRuntime(runtimeType)
     if (!path) {
       return {
         success: false,
         failureReason:
           'Steam Runtime is enabled, but no runtimes could be found\n' +
           `Make sure Steam ${
-            isNative ? 'is' : 'and the "SteamLinuxRuntime - Soldier" are'
+            isNative
+              ? 'is'
+              : `and the SteamLinuxRuntime - ${
+                  nonNativeRuntime === 'sniper' ? 'Sniper' : 'Soldier'
+                } are`
           } installed`
       }
     }

diff --git a/src/backend/utils.ts b/src/backend/utils.ts
@@ -633,10 +633,15 @@ async function searchForExecutableOnPath(executable: string): Promise<string> {
   }
 }
 async function getSteamRuntime(
-  requestedType: 'scout' | 'soldier'
+  requestedType: SteamRuntime['type']
 ): Promise<SteamRuntime> {
   const steamLibraries = await getSteamLibraries()
   const runtimeTypes: SteamRuntime[] = [
+    {
+      path: 'steamapps/common/SteamLinuxRuntime_sniper/run',
+      type: 'sniper',
+      args: ['--']
+    },
     {
       path: 'steamapps/common/SteamLinuxRuntime_soldier/run',
       type: 'soldier',

diff --git a/src/common/types.ts b/src/common/types.ts
@@ -312,7 +312,7 @@ interface GamepadInputEventMouse {
 
 export interface SteamRuntime {
   path: string
-  type: 'soldier' | 'scout'
+  type: 'sniper' | 'scout' | 'soldier'
   args: string[]
 }