feat: refactor cleanUpDownload to use safeRemoveDirectory and update related async calls

Author: flavioislima

src/backend/storeManagers/hyperplay/games.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,10 @@ async function applyPatching(
 
     if (signal.aborted) {
       logInfo(`Patching ${appName} aborted`, LogPrefix.HyperPlay)
-      rmSync(datastoreDir, { recursive: true })
-      return { status: 'abort' }
-    }
-
-    signal.onabort = () => {
+      await safeRemoveDirectory(datastoreDir, {
+        sizeThresholdMB: blockSize * totalBlocks
+      })
       aborted = true
-      rmSync(datastoreDir, { recursive: true })
       return { status: 'abort' }
     }
 
@@ -2005,7 +2003,9 @@ async function applyPatching(
     }
     // need this to cover 100% of abort cases
     if (aborted) {
-      rmSync(datastoreDir, { recursive: true })
+      await safeRemoveDirectory(datastoreDir, {
+        sizeThresholdMB: blockSize * totalBlocks
+      })
       return { status: 'abort' }
     }
 
@@ -2020,8 +2020,9 @@ async function applyPatching(
     })
 
     logInfo(`Patching ${appName} completed`, LogPrefix.HyperPlay)
-    rmSync(datastoreDir, { recursive: true })
-
+    await safeRemoveDirectory(datastoreDir, {
+      sizeThresholdMB: blockSize * totalBlocks
+    })
     return { status: 'done' }
   } catch (error) {
     if (error instanceof PatchingError) {
@@ -2061,7 +2062,7 @@ async function applyPatching(
 
     // errors can be thrown before datastore dir created. rmSync on nonexistent dir blocks indefinitely
     if (existsSync(datastoreDir)) {
-      rmSync(datastoreDir, { recursive: true })
+      await safeRemoveDirectory(datastoreDir)
     }
 
     return { status: 'error', error: `Error while patching ${error}` }

src/backend/utils.ts

@@ -983,7 +983,7 @@ export async function downloadFile(
   abortController: AbortController,
   progressCallback?: ProgressCallback,
   onCompleted?: (file: File) => void,
-  onCancel?: (item: DownloadItem) => void
+  onCancel?: (item: DownloadItem) => Promise<void>
 ): Promise<DownloadItem> {
   let lastProgressUpdateTime = Date.now()
   let lastBytesWritten = 0