[Linux] Search for Proton on all steam libraries

electron/config.ts

@@ -20,7 +20,8 @@ import {
   userHome,
   isFlatpak,
   isMac,
-  isWindows
+  isWindows,
+  getSteamLibraries
 } from './constants'
 import { execAsync } from './utils'
 import { logError, logInfo, LogPrefix } from './logger/logger'
@@ -241,15 +242,7 @@ abstract class GlobalConfig {
 
     const protonPaths = [`${heroicToolsPath}/proton/`]
 
-    // Known places where Steam might be found.
-    // Just add a new string here in case another path is found on another distro.
-    const steamPaths = [
-      join(userHome, '.steam'),
-      join(userHome, '.var/app/com.valvesoftware.Steam/.local/share/Steam'),
-      '/usr/share/steam'
-    ].filter((path) => existsSync(path))
-
-    steamPaths.forEach((path) => {
+    getSteamLibraries().forEach((path) => {
       protonPaths.push(`${path}/steam/steamapps/common`)
       protonPaths.push(`${path}/steamapps/common`)
       protonPaths.push(`${path}/root/compatibilitytools.d`)
@@ -262,11 +255,9 @@ abstract class GlobalConfig {
     protonPaths.forEach((path) => {
       if (existsSync(path)) {
         readdirSync(path).forEach((version) => {
-          const name = version.toLowerCase()
-          const hasProtonName =
-            name.startsWith('proton') || name.startsWith('ge-proton')
-          if (hasProtonName && !name.includes('runtime')) {
-            const protonBin = join(path, version, 'proton')
+          const protonBin = join(path, version, 'proton')
+          // check if bin exists to avoid false positives
+          if (existsSync(protonBin)) {
             proton.add({
               bin: protonBin,
               name: `Proton - ${version}`,

electron/constants.ts

@@ -1,12 +1,17 @@
 import { homedir, platform } from 'os'
 import { join } from 'path'
 import Store from 'electron-store'
+import { parse } from '@node-steam/vdf'
 
 import { GameConfigVersion, GlobalConfigVersion } from './types'
-import { createNewLogFileAndClearOldOnces } from './logger/logger'
+import {
+  createNewLogFileAndClearOldOnces,
+  logDebug,
+  LogPrefix
+} from './logger/logger'
 import { env } from 'process'
 import { app } from 'electron'
-import { existsSync } from 'graceful-fs'
+import { existsSync, readFileSync } from 'graceful-fs'
 
 const configStore = new Store({
   cwd: 'store'
@@ -109,6 +114,26 @@ function getSteamCompatFolder() {
   return `${userHome}/.steam/steam`
 }
 
+export function getSteamLibraries(): string[] {
+  const vdfFile = join(steamCompatFolder, 'steamapps', 'libraryfolders.vdf')
+  const libraries = ['/usr/share/steam']
+
+  if (existsSync(vdfFile)) {
+    const json = parse(readFileSync(vdfFile, 'utf-8'))
+    const folders = Object.values(json.libraryfolders) as Array<{
+      path: string
+    }>
+    return [...libraries, ...folders.map((folder) => folder.path)].filter(
+      (path) => existsSync(path)
+    )
+  }
+  logDebug(
+    'Unable to load Steam Libraries, libraryfolders.vdf not found',
+    LogPrefix.Backend
+  )
+  return libraries
+}
+
 const MAX_BUFFER = 25 * 1024 * 1024 // 25MB should be safe enough for big installations even on really slow internet
 
 const execOptions = {

package.json

@@ -136,6 +136,7 @@
     "@fortawesome/react-fontawesome": "^0.1.18",
     "@mui/icons-material": "^5.6.2",
     "@mui/material": "^5.6.2",
+    "@node-steam/vdf": "^2.2.0",
     "axios": "^0.26.1",
     "check-disk-space": "^3.3.0",
     "classnames": "^2.3.1",