Merge branch 'main' into tech/sust_ipc_refactor

Author: flavioislima

package.json

@@ -1,9 +1,8 @@
 {
   "name": "hyperplay",
-  "version": "0.23.2",
+  "version": "0.24.0",
   "private": true,
   "main": "build/main/main.js",
-  "productName": "HyperPlay",
   "homepage": "./",
   "license": "GPL-3.0-only",
   "description": "HyperPlay",
@@ -73,7 +72,7 @@
     "@hyperplay/chains": "^0.5.0",
     "@hyperplay/check-disk-space": "^3.5.2",
     "@hyperplay/quests-ui": "^0.1.26",
-    "@hyperplay/ui": "^1.9.9",
+    "@hyperplay/ui": "^1.11.1",
     "@hyperplay/utils": "^0.3.7",
     "@mantine/carousel": "^7.12.0",
     "@mantine/core": "^7.12.0",

pnpm-lock.yaml

@@ -884,7 +884,6 @@
         "autoUpdateGames": "Automatically update games",
         "autovkd3d": "Auto Install/Update VKD3D on Prefix",
         "change-target-exe": "Select an alternative EXE to run",
-        "checkForUpdatesOnStartup": "Check for HyperPlay Updates on Startup",
         "crossover-version": "Crossover/Wine Version",
         "custom_themes_path": "Custom Themes Path",
         "customWineProton": "Custom Wine/Proton Paths",

public/locales/en/translation.json

@@ -295,7 +295,6 @@ class GlobalConfigV0 extends GlobalConfig {
       autoInstallDxvkNvapi: false,
       addSteamShortcuts: false,
       preferSystemLibs: false,
-      checkForUpdatesOnStartup: !isLinux,
       autoUpdateGames: true,
       customWinePaths: isWindows ? null : [],
       defaultInstallPath: installPath,

src/backend/config.ts

@@ -228,6 +228,29 @@ export interface PatchingFailed {
   sensitiveProperties?: never
 }
 
+export interface PatchingAborted {
+  event: 'Patching Aborted'
+  properties: {
+    game_name: string
+    game_title: string
+    platform: ReturnType<typeof getPlatformName>
+    platform_arch: InstallPlatform
+  }
+  sensitiveProperties?: never
+}
+
+export interface PatchingCleanupFailed {
+  event: 'Patching Cleanup Failed'
+  properties: {
+    game_name: string
+    error: string
+    game_title: string
+    platform?: ReturnType<typeof getPlatformName>
+    platform_arch?: InstallPlatform
+  }
+  sensitiveProperties?: never
+}
+
 export interface PatchingTooSlow {
   event: 'Patching Too Slow'
   properties: {
@@ -475,6 +498,8 @@ export type PossibleMetricPayloads =
   | PatchingStarted
   | PatchingSuccess
   | PatchingFailed
+  | PatchingAborted
+  | PatchingCleanupFailed
   | PatchingTooSlow
   | AccountDropdownPortfolioClicked
 

src/backend/metrics/types.ts

@@ -65,7 +65,8 @@ import {
   handleArchAndPlatform,
   handlePlatformReversed,
   runModPatcher,
-  sanitizeVersion
+  sanitizeVersion,
+  safeRemoveDirectory
 } from './utils'
 import { getSettings as getSettingsSideload } from 'backend/storeManagers/sideload/games'
 import {
@@ -423,11 +424,11 @@ const findExecutables = async (folderPath: string): Promise<string[]> => {
   return executables
 }
 
-export function cleanUpDownload(appName: string, directory: string) {
+export async function cleanUpDownload(appName: string, directory: string) {
   inProgressDownloadsMap.delete(appName)
   inProgressExtractionsMap.delete(appName)
   deleteAbortController(appName)
-  rmSync(directory, { recursive: true, force: true })
+  await safeRemoveDirectory(directory)
 }
 
 function getDownloadUrl(platformInfo: PlatformConfig, appName: string) {
@@ -523,9 +524,9 @@ async function downloadGame(
       res()
     }
 
-    function onCancel() {
+    async function onCancel() {
       try {
-        cleanUpDownload(appName, directory)
+        await cleanUpDownload(appName, directory)
       } catch (err) {
         rej(err)
       }
@@ -1181,7 +1182,7 @@ export async function extract(
             body: `Installed`
           })
 
-          cleanUpDownload(appName, directory)
+          await cleanUpDownload(appName, directory)
 
           sendFrontendMessage('refreshLibrary', 'hyperplay')
 
@@ -1190,21 +1191,21 @@ export async function extract(
           })
         }
       )
-      extractService.once('error', (error: Error) => {
+      extractService.once('error', async (error: Error) => {
         logError(`Extracting Error ${error.message}`, LogPrefix.HyperPlay)
 
         cancelQueueExtraction()
         callAbortController(appName)
 
-        cleanUpDownload(appName, directory)
+        await cleanUpDownload(appName, directory)
 
         sendFrontendMessage('refreshLibrary', 'hyperplay')
 
         resolve({
           status: 'error'
         })
       })
-      extractService.once('canceled', () => {
+      extractService.once('canceled', async () => {
         logInfo(
           `Canceled Extracting: Cancellation completed on ${appName} - Destination ${destinationPath}`,
           LogPrefix.HyperPlay
@@ -1242,7 +1243,7 @@ export async function extract(
           body: 'Installation Stopped'
         })
 
-        cleanUpDownload(appName, directory)
+        await cleanUpDownload(appName, directory)
 
         sendFrontendMessage('refreshLibrary', 'hyperplay')
 
@@ -1914,13 +1915,18 @@ async function applyPatching(
 
     if (signal.aborted) {
       logInfo(`Patching ${appName} aborted`, LogPrefix.HyperPlay)
-      rmSync(datastoreDir, { recursive: true })
+      await safeRemoveDirectory(datastoreDir, {
+        sizeThresholdMB: blockSize * totalBlocks
+      })
+      aborted = true
       return { status: 'abort' }
     }
 
-    signal.onabort = () => {
+    signal.onabort = async () => {
       aborted = true
-      rmSync(datastoreDir, { recursive: true })
+      await safeRemoveDirectory(datastoreDir, {
+        sizeThresholdMB: blockSize * totalBlocks
+      })
       return { status: 'abort' }
     }
 
@@ -2005,7 +2011,36 @@ async function applyPatching(
     }
     // need this to cover 100% of abort cases
     if (aborted) {
-      rmSync(datastoreDir, { recursive: true })
+      try {
+        await safeRemoveDirectory(datastoreDir, {
+          sizeThresholdMB: blockSize * totalBlocks
+        })
+      } catch (cleanupError) {
+        trackEvent({
+          event: 'Patching Cleanup Failed',
+          properties: {
+            error: `${cleanupError}`,
+            game_name: gameInfo.app_name,
+            game_title: gameInfo.title,
+            platform: getPlatformName(platform),
+            platform_arch: platform
+          }
+        })
+
+        logWarning(
+          `Patching aborted and cleanup failed: ${cleanupError}`,
+          LogPrefix.HyperPlay
+        )
+      }
+      trackEvent({
+        event: 'Patching Aborted',
+        properties: {
+          game_name: gameInfo.app_name,
+          game_title: gameInfo.title,
+          platform: getPlatformName(platform),
+          platform_arch: platform
+        }
+      })
       return { status: 'abort' }
     }
 
@@ -2020,8 +2055,27 @@ async function applyPatching(
     })
 
     logInfo(`Patching ${appName} completed`, LogPrefix.HyperPlay)
-    rmSync(datastoreDir, { recursive: true })
+    try {
+      await safeRemoveDirectory(datastoreDir, {
+        sizeThresholdMB: blockSize * totalBlocks
+      })
+    } catch (cleanupError) {
+      trackEvent({
+        event: 'Patching Cleanup Failed',
+        properties: {
+          error: `${cleanupError}`,
+          game_name: gameInfo.app_name,
+          game_title: gameInfo.title,
+          platform: getPlatformName(platform),
+          platform_arch: platform
+        }
+      })
 
+      logWarning(
+        `Patching succeeded but cleanup failed: ${cleanupError}`,
+        LogPrefix.HyperPlay
+      )
+    }
     return { status: 'done' }
   } catch (error) {
     if (error instanceof PatchingError) {
@@ -2061,7 +2115,23 @@ async function applyPatching(
 
     // errors can be thrown before datastore dir created. rmSync on nonexistent dir blocks indefinitely
     if (existsSync(datastoreDir)) {
-      rmSync(datastoreDir, { recursive: true })
+      try {
+        await safeRemoveDirectory(datastoreDir)
+      } catch (cleanupError) {
+        trackEvent({
+          event: 'Patching Cleanup Failed',
+          properties: {
+            error: `${cleanupError}`,
+            game_name: gameInfo.app_name,
+            game_title: gameInfo.title
+          }
+        })
+
+        logWarning(
+          `Patching failed and cleanup failed: ${cleanupError}`,
+          LogPrefix.HyperPlay
+        )
+      }
     }
 
     return { status: 'error', error: `Error while patching ${error}` }