Merge branch 'main' of github.com:HyperPlay-Gaming/hyperplay-desktop-client into tech/sust_ipc_refactor

Author: flavioislima

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperplay",
-  "version": "0.24.0",
+  "version": "0.23.3",
   "private": true,
   "main": "build/main/main.js",
   "homepage": "./",

public/locales/fi/translation.json

@@ -1,8 +1,8 @@
 {
     "accessibility": {
-        "actions_font_family_no_default": "Toimintojen fonttiperhe (oletus): ",
+        "actions_font_family_no_default": "Toimintojen kirjaisinperhe (oletus): ",
         "all_tiles_in_color": "Näytä kaikki pelin laatat värillisinä",
-        "content_font_family_no_default": "Sisältöfonttiperhe (oletus): ",
+        "content_font_family_no_default": "Sisältökirjaisinperhe (oletus): ",
         "fonts": "Fontit",
         "title": "Esteettömyys",
         "zoom": "Zoom"

public/locales/ru/translation.json

@@ -696,7 +696,10 @@
         "achievements": "Достижения",
         "store": "Интернет-магазин",
         "library": "Библиотека",
-        "downloadManager": "Скачать менеджер"
+        "downloadManager": "Скачать менеджер",
+        "docs": "Документы",
+        "quests": "Квесты",
+        "settings": "Настройки"
     },
     "status": {
         "installing": "Установка",
@@ -1028,7 +1031,8 @@
         },
         "viewAllQuests": {
             "title": "Просмотр всех квестов"
-        }
+        },
+        "search": "Поиск"
     },
     "ALL": "Все",
     "analytics": "Аналитика",

src/backend/metrics/types.ts

@@ -228,29 +228,6 @@ 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: {
@@ -498,8 +475,6 @@ export type PossibleMetricPayloads =
   | PatchingStarted
   | PatchingSuccess
   | PatchingFailed
-  | PatchingAborted
-  | PatchingCleanupFailed
   | PatchingTooSlow
   | AccountDropdownPortfolioClicked
 

src/backend/storeManagers/hyperplay/games.ts

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