[Fix] Hotfix (#333)

* allow parallel downloads for chunking

* fix zoom range wrapper css

* ui: add 'preparing' status

* feat: base n of connections based on CDN cache

---------

Co-authored-by: Flavio F Lima <flavioislima@gmail.com>

Author: BrettCleary

src/backend/downloadmanager/utils.ts

@@ -54,10 +54,12 @@ async function installQueueElement(params: InstallParams): Promise<{
     }
   })
 
+  const startingStatus = runner === 'hyperplay' ? 'preparing' : 'installing'
+
   sendFrontendMessage('gameStatusUpdate', {
     appName,
     runner,
-    status: 'installing',
+    status: startingStatus,
     folder: path
   })
 

src/backend/storeManagers/hyperplay/games.ts

@@ -197,6 +197,7 @@ async function downloadGame(
   destinationPath: string
 ): Promise<void> {
   const appInfo = getGameInfo(appName)
+  let downloadStarted = false
 
   if (!appInfo || !appInfo.releaseMeta) {
     throw new Error('App not found in library')
@@ -227,6 +228,16 @@ async function downloadGame(
           platformInfo.downloadSize
         )
 
+        if (downloadedBytes > 0 && !downloadStarted) {
+          downloadStarted = true
+          sendFrontendMessage('gameStatusUpdate', {
+            appName,
+            status: 'installing',
+            runner: 'hyperplay',
+            folder: destinationPath
+          })
+        }
+
         window.webContents.send(`progressUpdate-${appName}`, {
           appName,
           status: 'installing',

src/backend/utils.ts

@@ -1220,6 +1220,18 @@ export interface ProgressCallback {
   ): void
 }
 
+/**
+ * Downloads a file from a given URL to a specified destination path.
+ * If there is cache on the CDN it will use 5 connections so the download will be faster.
+ * If there is no cache on the CDN it will use 1 connection, otherwise the download might fail to start.
+ *
+ * @param {string} url - The URL of the file to download.
+ * @param {string} dest - The destination path to save the downloaded file.
+ * @param {AbortController} abortController - The AbortController instance to cancel the download.
+ * @param {ProgressCallback} [progressCallback] - An optional callback function to track the download progress.
+ * @returns {Promise<void>} - A Promise that resolves when the download is complete.
+ * @throws {Error} - If the download fails or is incomplete.
+ */
 export async function downloadFile(
   url: string,
   dest: string,
@@ -1230,22 +1242,41 @@ export async function downloadFile(
   let lastBytesWritten = 0
   let fileSize = 0
 
+  let connections = 1
+  try {
+    const response = await axios.head(url)
+    const cdnCache = response.headers['cdn-cache']
+    const isCached = cdnCache === 'HIT' || cdnCache === 'STALE'
+    if (isCached) {
+      connections = 5
+    }
+    fileSize = parseInt(response.headers['content-length'], 10)
+  } catch (err) {
+    logError(
+      `Downloader: Failed to get headers for ${url}`,
+      LogPrefix.DownloadManager
+    )
+    throw new Error('Failed to get headers')
+  }
+
   try {
     const dl = new EasyDl(url, dest, {
       existBehavior: 'overwrite',
-      maxRetry: 10,
-      retryDelay: 1000,
-      connections: 1,
-      chunkSize: 1024 * 1024 * 10
+      connections
     }).start()
 
-    dl.on('metadata', (metadata) => {
-      fileSize = metadata.size
-    })
-
     abortController.signal.addEventListener('abort', () => {
       dl.destroy()
     })
+
+    dl.on('error', (error) => {
+      logError(error, LogPrefix.HyperPlay)
+    })
+
+    dl.on('retry', (retry) => {
+      logInfo(`Retrying download: ${retry}`, LogPrefix.HyperPlay)
+    })
+
     const throttledProgressCallback = throttle(
       (
         bytes: number,
@@ -1282,16 +1313,11 @@ export async function downloadFile(
       }
     })
 
-    dl.on('error', function (error) {
-      logError(`Downloader: Error: ${error}`, LogPrefix.DownloadManager)
-      throw error
-    })
-
     const downloaded = await dl.wait()
 
     if (!downloaded) {
       logWarning(
-        `: Downloader: File ${url} not downloaded`,
+        `Downloader: Download stopped or paused`,
         LogPrefix.DownloadManager
       )
       throw new Error('Download incomplete')

src/common/types.ts

@@ -191,6 +191,7 @@ export type Status =
   | 'installed'
   | 'extracting'
   | 'paused'
+  | 'preparing'
 
 export interface GameStatus {
   appName: string

src/frontend/hooks/constants.ts

@@ -34,7 +34,8 @@ export function getStatusLabel({
       runner === 'sideload' ? '' : size
     }`,
     notInstalled: t('gamepage:status.notinstalled'),
-    paused: t('gamepage:status.paused', 'Paused')
+    paused: t('gamepage:status.paused', 'Paused'),
+    preparing: t('gamepage:status.preparing', 'Preparing')
   }
 
   return statusMap[status] || t('gamepage:status.notinstalled')

src/frontend/screens/Accessibility/index.css

@@ -50,3 +50,9 @@ input[type='range'] {
 .Accessibility h1.headerTitle {
   margin-left: 0px;
 }
+
+.rangeWrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}

src/frontend/screens/Game/GamePage/index.tsx

@@ -118,6 +118,7 @@ export default React.memo(function GamePage(): JSX.Element | null {
   const isSyncing = status === 'syncing-saves'
   const isPaused = status === 'paused'
   const isExtracting = status === 'extracting'
+  const isPreparing = status === 'preparing'
   const notAvailable = !gameAvailable && gameInfo.is_installed
   const notSupportedGame =
     gameInfo.runner !== 'sideload' && gameInfo.thirdPartyManagedApp === 'Origin'
@@ -650,6 +651,10 @@ export default React.memo(function GamePage(): JSX.Element | null {
       return t('status.paused', 'Paused')
     }
 
+    if (isPreparing) {
+      return t('status.preparing', 'Preparing Download, please wait')
+    }
+
     if (notSupportedGame) {
       return t(
         'status.this-game-uses-third-party',
@@ -764,7 +769,7 @@ export default React.memo(function GamePage(): JSX.Element | null {
     if (isExtracting) {
       return t('status.extracting', 'Extracting files')
     }
-    if (isInstalling) {
+    if (isInstalling || isPreparing) {
       return t('button.queue.cancel', 'Cancel Download')
     }
     return t('button.install')

src/frontend/screens/Library/components/GameCard/constants.ts

@@ -31,6 +31,7 @@ export function getCardStatus(
   const notSupportedGame = status === 'notSupportedGame'
   const syncingSaves = status === 'syncing-saves'
   const isPaused = status === 'paused'
+  const isPreparing = status === 'preparing'
 
   const haveStatus =
     isMoving ||
@@ -44,7 +45,9 @@ export function getCardStatus(
     isPlaying ||
     syncingSaves ||
     (isInstalled && layout !== 'grid') ||
-    isPaused
+    isPaused ||
+    isPreparing
+
   return {
     isInstalling,
     notSupportedGame,
@@ -54,6 +57,7 @@ export function getCardStatus(
     notAvailable,
     isUpdating,
     isPaused,
+    isPreparing,
     haveStatus
   }
 }

src/frontend/state/GlobalState.tsx

@@ -581,7 +581,11 @@ class GlobalState extends PureComponent<Props> {
     )
 
     // in these cases we just add the new status
-    if (['installing', 'updating', 'playing', 'extracting'].includes(status)) {
+    if (
+      ['installing', 'updating', 'playing', 'extracting', 'preparing'].includes(
+        status
+      )
+    ) {
       currentApp.status = status
       newLibraryStatus.push(currentApp)
       this.setState({ libraryStatus: newLibraryStatus })