[Ref/Feat] System Information

package.json

@@ -1,6 +1,10 @@
 {
   "name": "heroic",
   "version": "2.9.1",
+  "versionNames": {
+    "stable": "Boa Hancock",
+    "beta": "Caesar Clown"
+  },
   "private": true,
   "main": "build/electron/main.js",
   "homepage": "./",
@@ -193,7 +197,6 @@
     "short-uuid": "^4.2.2",
     "simple-keyboard": "^3.5.33",
     "steam-shortcut-editor": "^3.1.1",
-    "systeminformation": "^5.17.12",
     "tslib": "^2.5.0",
     "zod": "^3.21.4"
   },

public/locales/en/translation.json

@@ -622,12 +622,35 @@
             "general": "General",
             "log": "Log",
             "other": "Other",
-            "sync": "Cloud Saves Sync"
+            "sync": "Cloud Saves Sync",
+            "systemInformation": "System Information"
         },
         "open-config-file": "Open Config File",
         "reset-heroic": "Reset Heroic",
         "saves": {
             "warning": "Cloud Saves feature is in Beta, please backup your saves before syncing (in case something goes wrong)"
+        },
+        "systemInformation": {
+            "copyToClipboard": "Copy to clipboard",
+            "cpu": "CPU:",
+            "cpuDescription": "{{numOfCores}}x {{modelName}}",
+            "gogdlVersion": "Gogdl: {{gogdlVersion}}",
+            "gpu": "GPU:",
+            "gpuDriver": "Driver: {{driverVersion}}",
+            "gpuWithNumber": "GPU {{number}}:",
+            "heroicVersion": "Heroic: {{heroicVersion}}",
+            "legendaryVersion": "Legendary: {{legendaryVersion}}",
+            "memory": "Memory:",
+            "memoryStats": "{{percentUsed}}% used ({{usedGib}} / {{totalGib}}",
+            "nileVersion": "Nile: {{nileVersion}}",
+            "os": "Operating System:",
+            "osNameFlatpak": "{{osName}} (inside Flatpak)",
+            "osVersion": "Version {{versionNumber}}",
+            "showDetailed": "Show detailed system specifications",
+            "software": "Software:",
+            "steamDeck": "Steam Deck",
+            "systemModel": "System Model:",
+            "systemSpecifications": "System Specifications:"
         }
     },
     "Settings": "Settings",

src/backend/api/misc.ts

@@ -105,8 +105,6 @@ export const handleGoToScreen = (callback: any) => {
   }
 }
 
-export const getOSInfo = async () => ipcRenderer.invoke('getOSInfo')
-
 export const handleShowDialog = (
   onMessage: (
     e: Electron.IpcRendererEvent,

src/backend/api/settings.ts

@@ -1,5 +1,6 @@
 import { AppSettings, GameSettings } from 'common/types'
 import { ipcRenderer } from 'electron'
+import type { SystemInformation } from '../utils/systeminfo'
 
 export const requestAppSettings = async () =>
   ipcRenderer.invoke('requestSettings', 'default') as Promise<AppSettings>
@@ -42,5 +43,8 @@ export const getLogContent = async (args: {
   defaultLast?: boolean
 }) => ipcRenderer.invoke('getLogContent', args)
 
-export const getNumOfGpus = async (): Promise<number> =>
-  ipcRenderer.invoke('getNumOfGpus')
+export const systemInfo = {
+  get: async (cache?: boolean): Promise<SystemInformation> =>
+    ipcRenderer.invoke('getSystemInfo', cache),
+  copyToClipboard: (): void => ipcRenderer.send('copySystemInfoToClipboard')
+}

src/backend/launcher.ts

@@ -21,7 +21,6 @@ import {
   constructAndUpdateRPC,
   getSteamRuntime,
   isEpicServiceOffline,
-  searchForExecutableOnPath,
   quoteIfNecessary,
   errorHandler,
   removeQuoteIfNecessary,
@@ -64,6 +63,7 @@ import * as VDF from '@node-steam/vdf'
 import { readFileSync } from 'fs'
 import { LegendaryCommand } from './storeManagers/legendary/commands'
 import { commandToArgsArray } from './storeManagers/legendary/library'
+import { searchForExecutableOnPath } from './utils/os/path'
 
 async function prepareLaunch(
   gameSettings: GameSettings,
@@ -96,7 +96,7 @@ async function prepareLaunch(
 
   // Figure out where MangoHud/GameMode are located, if they're enabled
   let mangoHudCommand: string[] = []
-  let gameModeBin = ''
+  let gameModeBin: string | null = null
   if (gameSettings.showMangohud) {
     const mangoHudBin = await searchForExecutableOnPath('mangohud')
     if (!mangoHudBin) {
@@ -173,7 +173,7 @@ async function prepareLaunch(
     success: true,
     rpcClient,
     mangoHudCommand,
-    gameModeBin,
+    gameModeBin: gameModeBin ?? undefined,
     steamRuntime,
     offlineMode
   }

src/backend/logger/logger.ts

@@ -9,8 +9,9 @@ import { showDialogBoxModalAuto } from '../dialog/dialog'
 import { appendMessageToLogFile, getLongestPrefix } from './logfile'
 import { backendEvents } from 'backend/backend_events'
 import { GlobalConfig } from 'backend/config'
-import { getGOGdlBin, getLegendaryBin, getSystemInfo } from 'backend/utils'
+import { getGOGdlBin, getLegendaryBin } from 'backend/utils'
 import { join } from 'path'
+import { formatSystemInfo, getSystemInfo } from '../utils/systeminfo'
 
 export enum LogPrefix {
   General = '',
@@ -67,13 +68,14 @@ export function initLogger() {
   }
 
   // log important information: binaries, system specs
-  getSystemInfo().then((systemInfo) => {
-    if (systemInfo === '') return
-    logInfo(`\n\n${systemInfo}\n`, {
-      prefix: LogPrefix.Backend,
-      forceLog: true
+  getSystemInfo()
+    .then(formatSystemInfo)
+    .then((systemInfo) => {
+      logInfo(`\nSystem Information:\n${systemInfo}\n`, {
+        prefix: LogPrefix.Backend,
+        forceLog: true
+      })
     })
-  })
 
   logInfo(['Legendary location:', join(...Object.values(getLegendaryBin()))], {
     prefix: LogPrefix.Legendary,

src/backend/main.ts

@@ -54,9 +54,6 @@ import {
   clearCache,
   execAsync,
   isEpicServiceOffline,
-  getLegendaryVersion,
-  getGogdlVersion,
-  getSystemInfo,
   handleExit,
   openUrlOrFile,
   resetHeroic,
@@ -70,8 +67,7 @@ import {
   getCurrentChangelog,
   checkWineBeforeLaunch,
   removeFolder,
-  downloadDefaultWine,
-  getNileVersion
+  downloadDefaultWine
 } from './utils'
 import {
   configStore,
@@ -126,7 +122,6 @@ import { notify, showDialogBoxModalAuto } from './dialog/dialog'
 import { addRecentGame } from './recent_games/recent_games'
 import { callAbortController } from './utils/aborthandler/aborthandler'
 import { getDefaultSavePath } from './save_sync'
-import si from 'systeminformation'
 import { initTrayIcon } from './tray_icon/tray_icon'
 import {
   createMainWindow,
@@ -156,6 +151,7 @@ import {
   getGameOverride,
   getGameSdl
 } from 'backend/storeManagers/legendary/library'
+import { formatSystemInfo, getSystemInfo } from './utils/systeminfo'
 
 app.commandLine?.appendSwitch('remote-debugging-port', '9222')
 
@@ -646,9 +642,6 @@ ipcMain.handle('getEpicGamesStatus', async () => isEpicServiceOffline())
 ipcMain.handle('getMaxCpus', () => cpus().length)
 
 ipcMain.handle('getHeroicVersion', app.getVersion)
-ipcMain.handle('getLegendaryVersion', getLegendaryVersion)
-ipcMain.handle('getGogdlVersion', getGogdlVersion)
-ipcMain.handle('getNileVersion', getNileVersion)
 ipcMain.handle('isFullscreen', () => isSteamDeckGameMode || isCLIFullscreen)
 ipcMain.handle('isFlatpak', () => isFlatpak)
 ipcMain.handle('getGameOverride', async () => getGameOverride())
@@ -658,11 +651,6 @@ ipcMain.handle('getPlatform', () => process.platform)
 
 ipcMain.handle('showUpdateSetting', () => !isFlatpak)
 
-ipcMain.handle('getNumOfGpus', async (): Promise<number> => {
-  const { controllers } = await si.graphics()
-  return controllers.length
-})
-
 ipcMain.handle('getLatestReleases', async () => {
   const { checkForUpdatesOnStartup } = GlobalConfig.get().getSettings()
   if (checkForUpdatesOnStartup) {
@@ -990,19 +978,13 @@ ipcMain.handle(
       powerDisplayId = powerSaveBlocker.start('prevent-display-sleep')
     }
 
-    const systemInfo = getSystemInfo()
-    const gameSettingsString = JSON.stringify(gameSettings, null, '\t')
     const logFileLocation = getLogFileLocation(appName)
 
-    systemInfo.then((systemInfo) => {
-      if (systemInfo === '') return
-      appendFileSync(
-        logFileLocation,
-        'System Info:\n' + `${systemInfo}\n` + '\n'
-      )
-    })
+    const systemInfo = await getSystemInfo().then(formatSystemInfo)
+    writeFileSync(logFileLocation, 'System Info:\n' + `${systemInfo}\n` + '\n')
 
-    writeFileSync(
+    const gameSettingsString = JSON.stringify(gameSettings, null, '\t')
+    appendFileSync(
       logFileLocation,
       `Game Settings: ${gameSettingsString}\n` +
         '\n' +
@@ -1688,7 +1670,7 @@ import './logger/ipc_handler'
 import './wine/manager/ipc_handler'
 import './shortcuts/ipc_handler'
 import './anticheat/ipc_handler'
-import 'backend/storeManagers/legendary/eos_overlay/ipc_handler'
+import './storeManagers/legendary/eos_overlay/ipc_handler'
 import './wine/runtimes/ipc_handler'
 import './downloadmanager/ipc_handler'
 import './utils/ipc_handler'